diff --git a/Student/API/__pycache__/main.cpython-313.pyc b/Student/API/__pycache__/main.cpython-313.pyc
deleted file mode 100644
index 74eef918869a75368f29e0c77be4ea528b66ec41..0000000000000000000000000000000000000000
Binary files a/Student/API/__pycache__/main.cpython-313.pyc and /dev/null differ
diff --git a/Student/API/main.py b/Student/API/main.py
index dce85ec776ed7dda76f95eecb7049956cda0821a..94bad59e7f9ad182e0ac166a1fcbea571d201261 100644
--- a/Student/API/main.py
+++ b/Student/API/main.py
@@ -3,6 +3,11 @@ from os import getlogin
 
 def getName():
     login = getlogin()
+
+    # Check for debug mode
+    if len(login.split(".")) != 3:
+        login = "john.doe.etu"
+
     name = login.split(".")[0][0].upper() + login.split(".")[0][1:] + " " + login.split(".")[1][0].upper() + login.split(".")[1][1:]
     return name
 
diff --git a/Teacher/main.py b/Teacher/main.py
index 8f45e47c0a1127a0189327a25d163e7320bed02a..e8cc013349ff1774f63ab11c41c26090a489d46a 100644
--- a/Teacher/main.py
+++ b/Teacher/main.py
@@ -22,18 +22,23 @@ class ConnectionHandler:
 
     def __init__(self, room):
 
-        # Make a list of the available addresses 
-        row = RANGES[room]
+        if room == ("DEBUG"):
+            self.addresses = ['127.0.0.1']
 
-        start = int(row[0].split(".")[3])
-        offset = int(row[1].split(".")[3])
-        numbers = [k for k in range(start, offset)]
+        else:
 
-        self.addresses = [row[0][0:10] + str(k) for k in numbers]
-        print(self.addresses)
+            # Make a list of the available addresses 
+            row = RANGES[room]
+
+            start = int(row[0].split(".")[3])
+            offset = int(row[1].split(".")[3])
+            numbers = [k for k in range(start, offset)]
+
+            self.addresses = [row[0][0:10] + str(k) for k in numbers]
+            print(self.addresses)
 
         # Hold a message list
-        self.messages {}
+        self.messages = {}
         
         for a in self.addresses:
             self.messages[a] = ""
@@ -46,7 +51,9 @@ class ConnectionHandler:
             message = response.content.decode("utf-8")
 
             if message != self.messages[a]:
-                changes[a] = messages
+                changes[a] = message
+
+            self.messages[a] = message
 
         return changes
 
@@ -59,8 +66,9 @@ while True:
     for c in changes:
         print(changes[c])
 
-    time.sleep(30)
+    if len(changes) > 0:
+        print("----------------------------------------------------")
 
-    print("----------------------------------------------------")
+    sleep(2)