diff --git a/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokMessageHandlerRegistration.java b/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokMessageHandlerRegistration.java
index 384277c..1dee12e 100644
--- a/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokMessageHandlerRegistration.java
+++ b/Client/src/main/java/io/github/jwdeveloper/tiktok/handlers/TikTokMessageHandlerRegistration.java
@@ -105,16 +105,18 @@ public class TikTokMessageHandlerRegistration extends TikTokMessageHandler {
     private TikTokEvent handleSocialMedia(WebcastResponse.Message msg) {
         var message = WebcastSocialMessage.parseFrom(msg.getBinary());
 
-        String type = message.getHeader().getSocialData().getType();
-        Pattern pattern = Pattern.compile("\\d+");
-        Matcher matcher = pattern.matcher(type);
-        if (matcher.find()) {
+        var socialType = message.getHeader().getSocialData().getType();
+        var pattern = Pattern.compile("pm_mt_guidance_viewer_([0-9]+)_share");
+        var matcher = pattern.matcher(socialType);
+
+        if (matcher.find())
+        {
             var value = matcher.group(0);
             var number = Integer.parseInt(value);
             return new TikTokShareEvent(message, number);
         }
 
-        var socialType = message.getHeader().getSocialData().getType();
+
         return switch (socialType) {
             case SocialTypes.LikeType -> new TikTokLikeEvent(message);
             case SocialTypes.FollowType -> new TikTokFollowEvent(message);
diff --git a/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/Main.java b/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/Main.java
index a771308..cef0083 100644
--- a/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/Main.java
+++ b/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/Main.java
@@ -7,7 +7,7 @@ import java.io.IOException;
 
 public class Main {
 
-    public static String TEST_TIKTOK_USER = "dmikl_";
+    public static String TEST_TIKTOK_USER = "kitovskyyy";
 
     public static void main(String[] args) throws IOException {
         var client = TikTokLive.newClient(TEST_TIKTOK_USER)
diff --git a/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/SimpleExample.java b/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/SimpleExample.java
index bbf56a9..ecc855d 100644
--- a/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/SimpleExample.java
+++ b/TestApplication/src/main/java/io/github/jwdeveloper/tiktok/SimpleExample.java
@@ -6,10 +6,15 @@ public class SimpleExample {
     public static void main(String[] args) throws IOException {
 
         TikTokLive.newClient(Main.TEST_TIKTOK_USER)
+                .onFollow((liveClient, event) ->
+                {
+                    System.out.println("Follow joined -> " + event.getNewFollower().getNickName());
+                })
                 .onConnected((client, event) ->
                 {
                     System.out.println("Connected");
                 })
+
                 .onJoin((client, event)  ->
                 {
                     System.out.println("User joined -> " + event.getUser().getNickName());