diff --git a/src/chat/NetworkClient.java b/src/chat/NetworkClient.java
index 86c151d..edc7a8c 100644
--- a/src/chat/NetworkClient.java
+++ b/src/chat/NetworkClient.java
@@ -191,7 +191,8 @@ class ConnectionListenerThread extends Thread {
 					}
 					if(accepted)
 					{
-						Socket s = (new ServerSocket(1237+(known_users.size()))).accept();
+						portNumber++;
+						Socket s = (new ServerSocket(portNumber)).accept();
 						(new ReceiveThread(user, s, displayArea, known_users, knownUsersPanel, dest_sockets)).start();
 		        	  	dest_sockets.add(s);
 		        	  	
@@ -207,7 +208,6 @@ class ConnectionListenerThread extends Thread {
 			            {
 			            	knownUsersPanel.append(" " + a.getName() + "  \n");
 			            }
-			            portNumber++;
 					}
 				}
 				catch(SocketTimeoutException e) {}
@@ -305,10 +305,11 @@ public class NetworkClient {
             	userListSocket.receive(responsePacket);
             	System.out.println("Received a reply from " + responsePacket.getAddress().getHostAddress());
                         	
-            	String[] response = new String(responsePacket.getData()).split(";");	
+            	String[] response = new String(responsePacket.getData()).trim().split(";");	
             	
             	String[] usernameList = response[0].split(" ");
                 String[] addressList = response[1].split(" ");
+                System.out.println (response[2].length());
                 portNumber = Integer.parseInt(response[2]);
                  
             	
@@ -345,17 +346,17 @@ public class NetworkClient {
       }
       catch (SocketException e2)
       {
-    	  e2.printStackTrace();
+    	  	e2.printStackTrace();
       }
       catch (Exception e3)
       {
-      	System.out.println(e3.getMessage());
+      		e3.printStackTrace();
       }
       
       if(connected)
       {
           
-          (new ConnectionListenerThread(user, known_users, dest_sockets, chatText, knownUsersPanel, 1234)).start();
+          (new ConnectionListenerThread(user, known_users, dest_sockets, chatText, knownUsersPanel, portNumber)).start();
           
           try
           {