diff --git a/powerwall.sh b/powerwall.sh
index 69b3109e..1421d0dc 100755
--- a/powerwall.sh
+++ b/powerwall.sh
@@ -328,7 +328,7 @@ POWERLOGGER_SERVICE(){
 
 RESTARTALL_SERVICES(){
 	STOPALL_SERVICES
-	sleep 5s
+	sleep 2s
 	STARTALL_SERVICES
 }
 STOPALL_SERVICES(){
@@ -338,8 +338,7 @@ STOPALL_SERVICES(){
 }
 STARTALL_SERVICES(){
 	for srvc in "${POWERWALL_SERVICES[@]}"; do
-		echo "Starting $srvc"
-		/bin/systemctl start $srvc
+		SERVICE_MNG ${srvc} start
 	done
 }
 SERVICE_MNG(){
@@ -616,9 +615,9 @@ fi
 					fi
 				
 				elif [ "${3}" = "restart" ]; then
-					/usr/local/bin/powerwall service ${2} stop
+					SERVICE_MNG ${2} stop
 					slep 2s
-					/usr/local/bin/powerwall service ${2} start
+					SERVICE_MNG ${2} start
 					
 				elif [ "${3}" = "status" ]; then
 					srvc=${POWERWALL_SERVICES[${2}]}