diff --git a/code/server/Server/PongServer.cs b/code/server/Server/PongServer.cs
index 7bc2121..d4ff319 100644
--- a/code/server/Server/PongServer.cs
+++ b/code/server/Server/PongServer.cs
@@ -95,9 +95,11 @@ public class PongServer
         nextPort++;
 
 
+        Tuple<int, bool> dataToSend = new Tuple<int, bool>(room.Port, true);
+        Console.WriteLine(JsonSerializer.Serialize(dataToSend));
 
         // Send port message to client
-        byte[] connectionData = Encoding.ASCII.GetBytes(room.Port.ToString());
+        byte[] connectionData = Encoding.ASCII.GetBytes(JsonSerializer.Serialize(dataToSend));
         serverSocket.Send(connectionData, connectionData.Length, remoteEndPoint);
 
         rooms[data.Data.playerId] = room;
@@ -108,15 +110,16 @@ public class PongServer
     private void Join(ObjectTransfert<Player> data, IPEndPoint remoteEndPoint, UdpClient serverSocket, Room room)
     {
 
-
-
         room.playerJoin = new KeyValuePair<Player, UdpClient>(data.Data, room.playerHost.Value);
 
 
         Console.WriteLine("New connection Client from " + remoteEndPoint.ToString());
 
+        Tuple<int, bool> dataToSend = new Tuple<int, bool>(room.Port, true);
+        Console.WriteLine(JsonSerializer.Serialize(dataToSend));
+
         // Send port message to client
-        byte[] connectionData = Encoding.ASCII.GetBytes(room.Port.ToString());
+        byte[] connectionData = Encoding.ASCII.GetBytes(JsonSerializer.Serialize(dataToSend));
         serverSocket.Send(connectionData, connectionData.Length, remoteEndPoint);
 
         room.PropertyChanged += room.OnReadyChanged;
diff --git a/code/server/Server/Room.cs b/code/server/Server/Room.cs
index b33f8b4..79af876 100644
--- a/code/server/Server/Room.cs
+++ b/code/server/Server/Room.cs
@@ -80,8 +80,6 @@ namespace Server
             Room room = sender as Room;
             int maxPlayer = room.nbPlayer;
 
-            //IPEndPoint serverEndPoint = new IPEndPoint(IPAddress.Any, Port);
-            //UdpClient serverSocket = new UdpClient(serverEndPoint);
 
 
             if (maxPlayer == 2)