diff --git a/WEB/Client/Client.php b/WEB/Client/Client.php
index 52993d68..1a01af44 100644
--- a/WEB/Client/Client.php
+++ b/WEB/Client/Client.php
@@ -1,64 +1,60 @@
-<?php
+<?php 
 
-class Client
-{
+class Client{
     private static $instance;
     private $socket;
-    public static function getInstance()
-    {
+    public static function getInstance() {
         if (self::$instance === null) {
             self::$instance = new self();
         }
         return self::$instance;
     }
 
-    public function Queuing()
-    {
-        global $port, $serverAdress, $rep, $vues, $BUFFER_SIZE;
+    public function Queuing(){
+        global $port,$serverAdress,$rep,$vues, $BUFFER_SIZE;
         $userModel = new UserModel();
+
         // pas d'arrêt d'éxécution du script (No timeout)
         set_time_limit(0);
-        $socket = socket_create(AF_INET, SOCK_STREAM, 0) or die("la socket n'a pas pu être créée ERROR : " . socket_strerror(socket_last_error()) . "\n");
+        $socket = socket_create(AF_INET, SOCK_STREAM, 0) or die("la socket n'a pas pu être créée ERROR : ".socket_strerror(socket_last_error())."\n");
         // connecter la socket à l'adresse ip et au port du serveur
         $result = socket_set_block($socket);
-        if ($result === false) {
+        if($result === false) {
             echo "socket_set_block a échoué : " . socket_strerror(socket_last_error()) . "\n";
         } else {
             echo "socket_set_block a réussi.\n";
         }
-        $result = socket_connect($socket, $serverAdress, $port) or die("Impossible de se connecter au serveur ERROR : " . socket_strerror(socket_last_error()) . "\n");
+        $result = socket_connect($socket, $serverAdress, $port) or die("Impossible de se connecter au serveur ERROR : ".socket_strerror(socket_last_error())."\n");
         if ($result === false) {
             // La connexion de la socket à l'adresse et au port a échoué
             echo "socket_connect a échoué : " . socket_strerror(socket_last_error()) . "\n";
         } else {
             echo "socket_connect a réussi.\n";
-            $request = "Queuing";
-            $result = socket_write($socket, $request, strlen($request));
-            if ($result === false) {
+            $request="Queuing";
+            $result=socket_write($socket,$request,strlen($request));
+            if($result === false) {
                 echo "socket_write a échoué : " . socket_strerror(socket_last_error()) . "\n";
             } else {
                 echo "socket_write a réussi.\n";
             }
-            $response = "";
-            $i = 0;
-            while ($i != 2) {
-                $response = socket_read($socket, $BUFFER_SIZE);
-                echo $response;
-                if ($response != false) {
+            $response="";
+            while(strcmp($response,"launchGame")!=0){
+                $response=socket_read($socket, $BUFFER_SIZE);
+                if($response!=false)
+                {
                     echo "socket_read a réussi.\n";
-                    if (strcmp($response, "refreshQueue") == 0) {
+                    if(strcmp($response,"refreshQueue")==0)
+                    {
                         $userGroup = $userModel->findUsersInQueue();
-                        $numberOfPlayer = count($userGroup);
-                        header('Location : ' . $rep . $vues['queue']);
+                        $numberOfPlayer=count($userGroup);
+                        header('Location : '.$rep.$vues['main']);
                     }
-                } else {
+                }
+                else{
                     echo "socket_read a échoué : " . socket_strerror(socket_last_error()) . "\n";
                     break;
                 }
-                sleep(5);
-                $i++;
-            }
-            require $rep . $vues['erreur'];
+        }
         }
     }
 }
\ No newline at end of file
diff --git a/WEB/server.php b/WEB/server.php
index 8e2ba21a..362de131 100644
--- a/WEB/server.php
+++ b/WEB/server.php
@@ -109,13 +109,14 @@ while(true) {
           echo ($function."\n");
           $response = $requestHandler->$function($client, $request);
           echo 'response : '.$response."\n";
+          socket_write($client,$response,strlen($response));
         } else {
           $response = "Invalid request";
-          // socket_write($client,$response,strlen($response));
+          socket_write($client,$response,strlen($response));
         }
       } else {
         $response = "Response is false";
-        // socket_write($client,$response,strlen($response));
+        socket_write($client,$response,strlen($response));
       }
     }
   }