diff --git a/Control/Pi/main_server.py b/Control/Pi/main_server.py
index ace4254..44ffea4 100755
--- a/Control/Pi/main_server.py
+++ b/Control/Pi/main_server.py
@@ -80,7 +80,11 @@ def safety_system():
             ThisSystem = psutil.Process(current_system_pid)
             ThisSystem.terminate()
 
-        if PROXIMITY_STOP_ENABLED:
+
+
+def proximity_system():
+    logger.info('Started proximity system')
+    if PROXIMITY_STOP_ENABLED:
             PROXIMITY_ARRAY.check_proximity()
 
 
@@ -112,6 +116,9 @@ def safety_watchdog():
 safety_system_thread = threading.Thread(target=safety_system)
 safety_system_thread.start()
 
+proximity_system_thread = threading.Thread(target=proximity_system)
+proximity_system_thread.start()
+
 watchdog_thread = threading.Thread(target=safety_watchdog)
 watchdog_thread.start()