diff --git a/ModExamples/24Websocket/WebsocketConnectionHandler.cs b/ModExamples/24Websocket/WebsocketConnectionHandler.cs
index b22c92b5..1fc198ec 100644
--- a/ModExamples/24Websocket/WebsocketConnectionHandler.cs
+++ b/ModExamples/24Websocket/WebsocketConnectionHandler.cs
@@ -1,41 +1,19 @@
 using System.Net.WebSockets;
 using System.Text;
-using Core.Helpers;
-using Core.Models.Eft.Ws;
 using Core.Models.Utils;
 using Core.Servers.Ws;
-using Core.Servers.Ws.Message;
-using Core.Utils;
 using SptCommon.Annotations;
-using LogLevel = Core.Models.Spt.Logging.LogLevel;
 
 namespace _24Websocket;
-// TODO: this is basically a copy of what we do, what is NEEDED of each method and add comments
 [Injectable(InjectionType = InjectionType.Singleton)]
-public class WebsocketConnectionHandler : IWebSocketConnectionHandler
+public class CustomWebSocketConnectionHandler: IWebSocketConnectionHandler
 {
-    private readonly ISptLogger<WebsocketConnectionHandler> _logger;
-    private readonly ProfileHelper _profileHelper;
-    private readonly JsonUtil _jsonUtil;
-    private readonly IEnumerable<ISptWebSocketMessageHandler> _messageHandlers;
-
-    protected WsPing _defaultNotification = new();
-    protected Lock _lockObject = new();
-    protected Dictionary<string, CancellationTokenSource> _receiveTasks = new();
-    protected Dictionary<string, Timer> _socketAliveTimers = new();
-
-    protected Dictionary<string, WebSocket> _sockets = new();
-
-    public WebsocketConnectionHandler(
-        ISptLogger<WebsocketConnectionHandler> logger,
-        ProfileHelper profileHelper,
-        JsonUtil jsonUtil,
-        IEnumerable<ISptWebSocketMessageHandler> messageHandlers
+    private readonly ISptLogger<CustomWebSocketConnectionHandler> _logger;
+    public CustomWebSocketConnectionHandler(
+        ISptLogger<CustomWebSocketConnectionHandler> logger
     )
     {
         _logger = logger;
-        _profileHelper = profileHelper;
-        _jsonUtil = jsonUtil;
     }
 
     public string GetHookUrl()
@@ -50,145 +28,25 @@ public class WebsocketConnectionHandler : IWebSocketConnectionHandler
 
     public Task OnConnection(WebSocket ws, HttpContext context)
     {
-        return Task.Factory.StartNew(
-            () =>
-            {
-                var splitUrl = context.Request.Path.Value.Split("/");
-                var sessionID = splitUrl.Last();
-                var playerProfile = _profileHelper.GetFullProfile(sessionID);
-                var playerInfoText = $"{playerProfile.ProfileInfo.Username} ({sessionID})";
-                _logger.Info($"Custom web socket is now connected!: {playerInfoText}");
+        _logger.Info("Custom web socket is now connected!");
 
-                _sockets.Add(sessionID, ws);
-
-                lock (_lockObject)
-                {
-                    _receiveTasks.Add(sessionID, new CancellationTokenSource());
-                    var cancelToken = _receiveTasks[sessionID].Token;
-                    Task.Factory.StartNew(_ => ReceiveTask(sessionID, ws, cancelToken), null, cancelToken);
-                }
-
-                while (ws.State == WebSocketState.Open)
-                {
-                    Thread.Sleep(1000);
-                }
-
-                // Once the websocket dies, we dispose of it
-                lock (_lockObject)
-                {
-                    if (_socketAliveTimers.TryGetValue(sessionID, out var timer))
-                    {
-                        timer.Change(Timeout.Infinite, Timeout.Infinite);
-                        _socketAliveTimers.Remove(sessionID);
-                    }
-
-                    if (_sockets.ContainsKey(sessionID))
-                    {
-                        _sockets.Remove(sessionID);
-                    }
-
-                    if (_receiveTasks.TryGetValue(sessionID, out var receiveTask))
-                    {
-                        receiveTask.CancelAsync().Wait();
-                    }
-                }
-            }
-        );
+        return Task.CompletedTask;
     }
 
-    private void ReceiveTask(string sessionId, WebSocket ws, CancellationToken cancelToken)
+    public Task OnMessage(byte[] rawData, WebSocketMessageType messageType, WebSocket ws, HttpContext context)
     {
-        List<byte> readBytes = new();
-        while (ws.State == WebSocketState.Open)
+        var msg = Encoding.UTF8.GetString(rawData);
+
+        if (msg == "toodaloo")
         {
-            try
-            {
-                if (cancelToken.IsCancellationRequested)
-                {
-                    break;
-                }
-
-                var isEndOfMessage = false;
-                while (!isEndOfMessage)
-                {
-                    var buffer = new ArraySegment<byte>(new byte[1024 * 4]);
-                    var readTask = ws.ReceiveAsync(buffer, cancelToken);
-                    readTask.Wait(cancelToken);
-                    readBytes.AddRange(buffer);
-                    isEndOfMessage = readTask.Result.EndOfMessage;
-                }
-
-                foreach (var sptWebSocketMessageHandler in _messageHandlers)
-                {
-                    sptWebSocketMessageHandler.OnSptMessage(sessionId, ws, readBytes.ToArray()).Wait();
-                }
-            }
-            catch (OperationCanceledException _)
-            {
-                _logger.Info("WebSocket disconnecting, receive task finalized...");
-            }
-            catch (Exception _)
-            {
-                lock (_lockObject)
-                {
-                    _sockets.Remove(sessionId);
-                    _socketAliveTimers.Remove(sessionId);
-                    _receiveTasks.Remove(sessionId);
-                    var playerProfile = _profileHelper.GetFullProfile(sessionId);
-                    var playerInfoText = $"{playerProfile.ProfileInfo.Username} ({sessionId})";
-                    _logger.Info($"[ws] player: {playerInfoText} has disconnected");
-                }
-
-                ws.CloseAsync(WebSocketCloseStatus.NormalClosure, "Client closed connection", CancellationToken.None);
-            }
-            finally
-            {
-                readBytes.Clear();
-            }
+            return ws.SendAsync(Encoding.UTF8.GetBytes("toodaloo back!"), WebSocketMessageType.Text, true, CancellationToken.None);
         }
+
+        return Task.CompletedTask;
     }
 
-    public bool IsWebSocketConnected(string sessionId)
+    public Task OnClose(WebSocket ws, HttpContext context)
     {
-        return _sockets.TryGetValue(sessionId, out var socket) && socket.State == WebSocketState.Open;
-    }
-
-    public void SendMessage(string sessionID, WsNotificationEvent output)
-    {
-        try
-        {
-            if (IsWebSocketConnected(sessionID))
-            {
-                var ws = GetSessionWebSocket(sessionID);
-
-                var sendTask = ws.SendAsync(
-                    Encoding.UTF8.GetBytes(_jsonUtil.Serialize(output, output.GetType())),
-                    WebSocketMessageType.Text,
-                    true,
-                    CancellationToken.None
-                );
-                sendTask.Wait();
-                if (_logger.IsLogEnabled(LogLevel.Debug))
-                {
-                    _logger.Debug("Sent Message");
-                }
-            }
-            else
-            {
-                if (_logger.IsLogEnabled(LogLevel.Debug))
-                {
-                    _logger.Debug("Couldnt send Message");
-                }
-            }
-        }
-        catch (Exception err)
-        {
-            _logger.Error("message failed with error");
-        }
-    }
-
-    public WebSocket GetSessionWebSocket(string sessionID)
-    {
-        return _sockets[sessionID];
+        return Task.CompletedTask;
     }
 }
diff --git a/ModExamples/TempReferences/Core.dll b/ModExamples/TempReferences/Core.dll
index a92a944d..9c5b0954 100644
Binary files a/ModExamples/TempReferences/Core.dll and b/ModExamples/TempReferences/Core.dll differ
diff --git a/ModExamples/TempReferences/SptCommon.dll b/ModExamples/TempReferences/SptCommon.dll
index 8ca856c4..f5d35fee 100644
Binary files a/ModExamples/TempReferences/SptCommon.dll and b/ModExamples/TempReferences/SptCommon.dll differ