diff --git a/scripts/Makefile b/scripts/Makefile
index e2f7375..74a62ca 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -231,34 +231,34 @@ thunder_configure_full_parse:
 thunder_configure_2_full:
 	./run-3 \
 		1,thunder_configure_2. \
-		thunder-client 6000 100 100 2 50, \
-		  thunder-client 6000 100 100 2 100, \
-		  thunder-client 6000 100 100 2 150, \
-		  thunder-client 6000 100 100 2 200, \
-		  thunder-client 6000 100 100 2 250, \
-		  thunder-client 6000 100 100 2 300, \
-		  thunder-client 6000 100 100 2 350, \
-		  thunder-client 6000 100 100 4 50, \
-		  thunder-client 6000 100 100 4 100, \
-		  thunder-client 6000 100 100 4 150, \
-		  thunder-client 6000 100 100 4 200, \
-		  thunder-client 6000 100 100 4 250, \
-		  thunder-client 6000 100 100 4 300, \
-		  thunder-client 6000 100 100 4 350, \
-		  thunder-client 6000 100 100 6 50, \
-		  thunder-client 6000 100 100 6 100, \
-		  thunder-client 6000 100 100 6 150, \
-		  thunder-client 6000 100 100 6 200, \
-		  thunder-client 6000 100 100 6 250, \
-		  thunder-client 6000 100 100 6 300, \
-		  thunder-client 6000 100 100 6 350, \
-		  thunder-client 6000 100 100 8 50, \
-		  thunder-client 6000 100 100 8 100, \
-		  thunder-client 6000 100 100 8 150, \
-		  thunder-client 6000 100 100 8 200, \
-		  thunder-client 6000 100 100 8 250, \
-		  thunder-client 6000 100 100 8 300, \
-		  thunder-client 6000 100 100 8 350. \
+		thunder-client 9900 30 100 2 50, \
+		  thunder-client 9900 30 100 2 100, \
+		  thunder-client 9900 30 100 2 150, \
+		  thunder-client 9900 30 100 2 200, \
+		  thunder-client 9900 30 100 2 250, \
+		  thunder-client 9900 30 100 2 300, \
+		  thunder-client 9900 30 100 2 350, \
+		  thunder-client 9900 30 100 4 50, \
+		  thunder-client 9900 30 100 4 100, \
+		  thunder-client 9900 30 100 4 150, \
+		  thunder-client 9900 30 100 4 200, \
+		  thunder-client 9900 30 100 4 250, \
+		  thunder-client 9900 30 100 4 300, \
+		  thunder-client 9900 30 100 4 350, \
+		  thunder-client 9900 30 100 6 50, \
+		  thunder-client 9900 30 100 6 100, \
+		  thunder-client 9900 30 100 6 150, \
+		  thunder-client 9900 30 100 6 200, \
+		  thunder-client 9900 30 100 6 250, \
+		  thunder-client 9900 30 100 6 300, \
+		  thunder-client 9900 30 100 6 350, \
+		  thunder-client 9900 30 100 8 50, \
+		  thunder-client 9900 30 100 8 100, \
+		  thunder-client 9900 30 100 8 150, \
+		  thunder-client 9900 30 100 8 200, \
+		  thunder-client 9900 30 100 8 250, \
+		  thunder-client 9900 30 100 8 300, \
+		  thunder-client 9900 30 100 8 350. \
 		thunder-server 2 50, \
 		  thunder-server 2 100, \
 		  thunder-server 2 150, \
diff --git a/scripts/run-3 b/scripts/run-3
index eed2ce5..2ed9034 100755
--- a/scripts/run-3
+++ b/scripts/run-3
@@ -5,7 +5,7 @@
 
 die() { echo "$*" 1>&2 ; exit 1; }
 
-WAITFOR=2280 # 38min
+WAITFOR=900 # 15min
 
 # SPLIT CLIENT AND SERVER TARGETS
 OLD_IFS=$IFS; IFS="."