diff --git a/Drone/copter_client.py b/Drone/copter_client.py
index a20d8ee..17209d5 100644
--- a/Drone/copter_client.py
+++ b/Drone/copter_client.py
@@ -228,11 +228,10 @@ def _response_id(*args, **kwargs):
                     configure_motd(hostname)
                     execute_command("hostname {}".format(hostname))
                     restart_service("dhcpcd")
-                    time.sleep(0.5)
                     restart_service("avahi-daemon")
-                    time.sleep(0.5)
-                    restart_service("clever")
                     restart_service("smbd")
+                    restart_service("roscore")
+                    restart_service("clever")
                 restart_service("clever-show")
 
 
diff --git a/builder/assets/clever-show.service b/builder/assets/clever-show.service
index e1885e5..3c8466b 100644
--- a/builder/assets/clever-show.service
+++ b/builder/assets/clever-show.service
@@ -1,6 +1,8 @@
 [Unit]
 Description=Clever Show Client Service
-After=clever.service
+Requires=clever.service
+Requires=network.target
+After=network.target
 
 [Service]
 WorkingDirectory=/home/pi/clever-show/Drone