diff --git a/Client/ViewModels/ViewModelGame.cs b/Client/ViewModels/ViewModelGame.cs
index 98846e3..3750369 100644
--- a/Client/ViewModels/ViewModelGame.cs
+++ b/Client/ViewModels/ViewModelGame.cs
@@ -75,8 +75,13 @@ namespace Client.ViewModels
             data.Client.IncomingPlayer = HandleIncomingPlayer;
             data.Client.UpdateUserScores = UpdateUserScores;
 
+            Application.Current.Dispatcher.Invoke(delegate
+            {
+                Messages.Clear();
+            });
 
-            queueTimer = new Timer(50);
+
+                queueTimer = new Timer(50);
             queueTimer.Start();
             queueTimer.Elapsed += sendArrayFromQueue;
         }
diff --git a/Server/Models/ServerClient.cs b/Server/Models/ServerClient.cs
index eb607d6..66b9d22 100644
--- a/Server/Models/ServerClient.cs
+++ b/Server/Models/ServerClient.cs
@@ -176,7 +176,8 @@ namespace Server.Models
                                 coords = JSONConvert.getCoordinates(payload),
                                 color = JSONConvert.getCanvasDrawingColor(payload)
                             };
-                            serverCom.SendToLobby(serverCom.GetLobbyForUser(User),JSONConvert.GetMessageToSend(JSONConvert.CANVAS,canvasData));
+                            //serverCom.SendToLobby(serverCom.GetLobbyForUser(User),JSONConvert.GetMessageToSend(JSONConvert.CANVAS,canvasData));
+                            serverCom.SendCanvasDataToLobby(serverCom.GetLobbyForUser(User), User.Username, JSONConvert.GetMessageToSend(JSONConvert.CANVAS, canvasData));
                             break;
 
                         case JSONConvert.CANVAS_RESET:
diff --git a/Server/Models/ServerCommunication.cs b/Server/Models/ServerCommunication.cs
index 3dbdb8e..9670660 100644
--- a/Server/Models/ServerCommunication.cs
+++ b/Server/Models/ServerCommunication.cs
@@ -174,7 +174,8 @@ namespace Server.Models
                 {
                     foreach (ServerClient sc in serverClientsInlobbies[l])
                     {
-                        sc.sendMessage(message);
+                        if (sc.User.Username != username)
+                            sc.sendMessage(message);
                     }
                     break;
                 }