diff --git a/src/main/java/lab12/ServerApp.java b/src/main/java/lab12/ServerApp.java
index 1dd3817700dc6af489b3688fef23b81865627965..f051ab926afb4deef9579cd9e5c288561810062c 100644
--- a/src/main/java/lab12/ServerApp.java
+++ b/src/main/java/lab12/ServerApp.java
@@ -21,10 +21,12 @@ public class ServerApp {
 	}
 
 	protected void listen() {
+		System.out.println("Server started and ready to connection");
 		try {
 			while (true) {
 				Socket socketFromClient = server.accept();
-				new Thread(new ServerComunicator(socketFromClient)).start();
+				System.out.println("Client connected: " + socketFromClient.getInetAddress());
+				new ServerComunicator(socketFromClient).handle();
 			}
 		} catch (Exception e) {
 			e.printStackTrace();
diff --git a/src/main/java/lab12/ServerComunicator.java b/src/main/java/lab12/ServerComunicator.java
index b8e3019def35692d63c30bc81254166e01936ff9..4eccc0462379bcd49a6b82be338eb85a112a3ac3 100644
--- a/src/main/java/lab12/ServerComunicator.java
+++ b/src/main/java/lab12/ServerComunicator.java
@@ -7,7 +7,7 @@ import java.io.InputStreamReader;
 import java.io.OutputStreamWriter;
 import java.net.Socket;
 
-public class ServerComunicator implements Runnable{
+public class ServerComunicator {
 
 	private Socket socket;
 
@@ -15,8 +15,7 @@ public class ServerComunicator implements Runnable{
 		this.socket = socketFromCliernt;
 	}
 
-	@Override
-	public void run() {
+	public void handle() {
 		try (BufferedReader readerFromClentSocket = new BufferedReader(new InputStreamReader(socket.getInputStream()));
 				BufferedWriter writerToClentSocket = new BufferedWriter(new OutputStreamWriter(socket.getOutputStream()))) {
 			String lineRededClient;
@@ -35,10 +34,5 @@ public class ServerComunicator implements Runnable{
 		} catch (IOException e) {
 			e.printStackTrace();
 		}
-
 	}
-	
-	
-	
-	
 }