diff --git a/scripts/Makefile b/scripts/Makefile
index a3203bc..6fafbfa 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -111,18 +111,6 @@ tor2-pkt-per-sec:
 lightning-window:
 	./run-3 \
 		32,lightning_window. \
-		lightning-server 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=500, \
-		lightning-server 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=1000, \
-		lightning-server 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=1500, \
-		lightning-server 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=2000, \
-		lightning-server 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=2500, \
-		lightning-server 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=3000, \
-		lightning-server 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=500, \
-		lightning-server 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=1000, \
-		lightning-server 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=1500, \
-		lightning-server 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=2000, \
-		lightning-server 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=2500, \
-		lightning-server 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=3000. \
 		lightning-client 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=500, \
 		lightning-client 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=1000, \
 		lightning-client 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=1500, \
@@ -135,6 +123,18 @@ lightning-window:
 		lightning-client 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=2000, \
 		lightning-client 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=2500, \
 		lightning-client 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=3000. \
+		lightning-server 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=500, \
+		lightning-server 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=1000, \
+		lightning-server 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=1500, \
+		lightning-server 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=2000, \
+		lightning-server 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=2500, \
+		lightning-server 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=3000, \
+		lightning-server 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=500, \
+		lightning-server 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=1000, \
+		lightning-server 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=1500, \
+		lightning-server 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=2000, \
+		lightning-server 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=2500, \
+		lightning-server 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=3000. \
 		tor2 -f /etc/torrc_simple, \
 		tor2 -f /etc/torrc_simple, \
 		tor2 -f /etc/torrc_simple, \
@@ -163,18 +163,6 @@ lightning-window:
 lightning-links:
 	./run-3 \
 		32,lightning_window. \
-		lightning-server 7500 40 172 4 fast_count=2!tick_tock=1!measlat=1!window=2000, \
-		lightning-server 7500 40 172 6 fast_count=2!tick_tock=1!measlat=1!window=2000, \
-		lightning-server 7500 40 172 8 fast_count=2!tick_tock=1!measlat=1!window=2000, \
-		lightning-server 7500 40 172 10 fast_count=2!tick_tock=1!measlat=1!window=2000, \
-		lightning-server 7500 40 172 12 fast_count=2!tick_tock=1!measlat=1!window=2000, \
-		lightning-server 7500 40 172 14 fast_count=2!tick_tock=1!measlat=1!window=2000, \
-		lightning-server 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=2000, \
-		lightning-server 7500 40 172 8 fast_count=4!tick_tock=0!measlat=1!window=2000, \
-		lightning-server 7500 40 172 10 fast_count=4!tick_tock=0!measlat=1!window=2000, \
-		lightning-server 7500 40 172 12 fast_count=4!tick_tock=0!measlat=1!window=2000, \
-		lightning-server 7500 40 172 14 fast_count=4!tick_tock=0!measlat=1!window=2000, \
-		lightning-server 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=2000. \
 		lightning-client 7500 40 172 4 fast_count=2!tick_tock=1!measlat=1!window=2000, \
 		lightning-client 7500 40 172 6 fast_count=2!tick_tock=1!measlat=1!window=2000, \
 		lightning-client 7500 40 172 8 fast_count=2!tick_tock=1!measlat=1!window=2000, \
@@ -187,6 +175,18 @@ lightning-links:
 		lightning-client 7500 40 172 12 fast_count=4!tick_tock=0!measlat=1!window=2000, \
 		lightning-client 7500 40 172 14 fast_count=4!tick_tock=0!measlat=1!window=2000, \
 		lightning-client 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=2000. \
+		lightning-server 7500 40 172 4 fast_count=2!tick_tock=1!measlat=1!window=2000, \
+		lightning-server 7500 40 172 6 fast_count=2!tick_tock=1!measlat=1!window=2000, \
+		lightning-server 7500 40 172 8 fast_count=2!tick_tock=1!measlat=1!window=2000, \
+		lightning-server 7500 40 172 10 fast_count=2!tick_tock=1!measlat=1!window=2000, \
+		lightning-server 7500 40 172 12 fast_count=2!tick_tock=1!measlat=1!window=2000, \
+		lightning-server 7500 40 172 14 fast_count=2!tick_tock=1!measlat=1!window=2000, \
+		lightning-server 7500 40 172 16 fast_count=2!tick_tock=1!measlat=1!window=2000, \
+		lightning-server 7500 40 172 8 fast_count=4!tick_tock=0!measlat=1!window=2000, \
+		lightning-server 7500 40 172 10 fast_count=4!tick_tock=0!measlat=1!window=2000, \
+		lightning-server 7500 40 172 12 fast_count=4!tick_tock=0!measlat=1!window=2000, \
+		lightning-server 7500 40 172 14 fast_count=4!tick_tock=0!measlat=1!window=2000, \
+		lightning-server 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=2000. \
 		tor2 -f /etc/torrc_simple, \
 		tor2 -f /etc/torrc_simple, \
 		tor2 -f /etc/torrc_simple, \
diff --git a/scripts/run-3 b/scripts/run-3
index 53ac5cf..0daa6af 100755
--- a/scripts/run-3
+++ b/scripts/run-3
@@ -93,10 +93,10 @@ echo "__launch servers"
 for i in $(seq 0 $(expr $instances - 1)); do
   echo "    instance=$i - exec=${SERVER_TARGETS[$i]}"
   docker exec donarxp_server_$i ${SERVER_TARGETS[$i]} ${run_fold}-$i &
-  sleep 5
+  sleep 1
 done
 
-sleep 10
+sleep 2
 echo "__launch clients"
 
 (subshellpid=$BASHPID 
@@ -104,7 +104,7 @@ echo "__launch clients"
   (for i in $(seq 0 $(expr $instances - 1)); do
     echo "    instance=$i - exec=${CLIENT_TARGETS[$i]}"
     docker exec donarxp_client_$i ${CLIENT_TARGETS[$i]} ${run_fold}-$i &
-    sleep 10
+    sleep 1
   done; 
   wait; 
   echo "  ok";