diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/TestServer/Client.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/TestServer/Client.java
index 5cc1d98fedbb842d26e6f55cf49a36cc48b21406..1b8cf250c2371d527ecd37daae8c8ad74162d7c3 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/TestServer/Client.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/TestServer/Client.java
@@ -21,12 +21,12 @@ public class Client {
     }
 
     public int sendX(int number) throws IOException {
-        out.println(number);
+        out.println("x:" + number);
         return number;
     }
 
     public int sendY(int number) throws IOException {
-        out.println(number);
+        out.println("y:" + number);
         return number;
     }
 
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/TestServer/ConnectionHandling.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/TestServer/ConnectionHandling.java
index 085fad367fee064e80e6ded9b93a380a5eba2f6e..3c88105d65fe517b8d7ebd578385660ed82ccefa 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/TestServer/ConnectionHandling.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/TestServer/ConnectionHandling.java
@@ -7,12 +7,12 @@ public class ConnectionHandling {
 
     public static void main(String[] args) throws IOException, InterruptedException {
         Client client = new Client();
-        client.startConnection("localhost", 4444);
+        client.startConnection("192.168.0.105", 4444);
         for (int i = 0; i < 10; i++){
-            int x = client.sendX(1);
+            int x = client.sendX(1+i);
             System.out.println(x);
 
-            int y = client.sendX(0);
+            int y = client.sendY(0+i);
             System.out.println(y);
 
             TimeUnit.SECONDS.sleep(1);
diff --git a/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/TestServer/Server.java b/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/TestServer/Server.java
index da8104cd246d42139cc2192799d81212d5bc5182..170b4e5f3c2996012a11f07018881426318d20b6 100644
--- a/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/TestServer/Server.java
+++ b/src/main/java/de/hdm_stuttgart/battlearena/Model/Multiplayer/TestServer/Server.java
@@ -2,21 +2,24 @@ package de.hdm_stuttgart.battlearena.Model.Multiplayer.TestServer;
 
 import java.net.*;
 import java.io.*;
+import java.util.concurrent.Executors;
+import java.util.concurrent.ScheduledExecutorService;
+import java.util.concurrent.TimeUnit;
 
 public class Server {
     private ServerSocket serverSocket;
-    private static BufferedReader px;
-    private static BufferedReader py;
+    private static int px;
+    private static int py;
 
     public static void main(String[] args) throws IOException {
         Server server = new Server();
-        server.start("localhost",4444);
+        server.start("192.168.0.105",4444);
     }
 
     public void start(String lolcalhost, int port) throws IOException {
         serverSocket = new ServerSocket(port);
         while (true)
-            new EchoClientHandler(serverSocket.accept()).start();
+            new ServerHandler(serverSocket.accept()).start();
     }
 
     public void stop() throws IOException {
@@ -25,54 +28,46 @@ public class Server {
 
     // EchoClientHandler class in the Server
 
-    private static class EchoClientHandler extends Thread {
+    private static class ServerHandler extends Thread {
         private Socket clientSocket;
         private PrintWriter out;
         private BufferedReader in;
 
-
-        public EchoClientHandler(Socket socket) {
+        public ServerHandler(Socket socket) {
             this.clientSocket = socket;
         }
 
         public void run() {
-            try {
-                out = new PrintWriter(clientSocket.getOutputStream(), true);
-                in = new BufferedReader(new InputStreamReader(clientSocket.getInputStream()));
+            ScheduledExecutorService executorService = Executors.newSingleThreadScheduledExecutor();
 
-                BufferedReader inputLine = in;
-                px = in;
+            executorService.scheduleAtFixedRate(() -> {
+                try {
+                    BufferedReader localIn = new BufferedReader(new InputStreamReader(clientSocket.getInputStream()));
+                    PrintWriter localOut = new PrintWriter(clientSocket.getOutputStream(), true);
 
-                while (true) {
-                    System.out.println("Received message from client: " + px.readLine());
+                    String inputLine = localIn.readLine();
 
-                    if (inputLine.equals(0)) {
-                        out.println("bye");
-                        out.flush();
-                        System.out.println("Sent response to client: bye");
-                        break;
-                    }
+                    if (inputLine != null) {
+                        if (inputLine.startsWith("x:")) {
+                            int receivedX = Integer.parseInt(inputLine.substring(2));
+                            px = receivedX;
 
-                    out.println(px);
-                    out.flush();
-                    System.out.println("Sent response to client: " + px.readLine());
-                }
-            } catch (SocketException e) {
-                System.out.println("Client connection reset.");
-            } catch (IOException e) {
-                e.printStackTrace();
-            } finally {
-                try {
-                    in.close();
-                    out.close();
-                    clientSocket.close();
+                        } else if (inputLine.startsWith("y:")) {
+                            int receivedY = Integer.parseInt(inputLine.substring(2));
+                            py = receivedY;
+                        }
+
+                        localOut.println(inputLine);
+                        localOut.flush();
+                        System.out.println("Current X: " + px + " Current Y: " + py);
+                        System.out.println("Sent response to client: " + inputLine);
+                    }
                 } catch (IOException e) {
                     e.printStackTrace();
                 }
-            }
+            }, 0, 250, TimeUnit.MILLISECONDS);
         }
 
-
     }
 
 }