diff --git a/scripts/Makefile b/scripts/Makefile
index 89d43d4..d458479 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -900,34 +900,34 @@ jan_dcall_normal:
 		dcall-simple-client 1 360, \
 		dcall-simple-client 1 360, \
 		dcall-simple-client 1 360, \
-		dcall-dup2-client 2 352, \
-		dcall-dup2-client 2 352, \
-		dcall-dup2-client 2 352, \
-		dcall-dup2-client 2 352, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 213, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 213, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 213, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 213, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 176, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 176, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 176, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 176. \
+		dcall-dup2-client 2 360, \
+		dcall-dup2-client 2 360, \
+		dcall-dup2-client 2 360, \
+		dcall-dup2-client 2 360, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 233, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 233, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 233, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 233, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 196, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 196, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 196, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 196. \
 		dcall-simple-server 1 360, \
 		dcall-simple-server 1 360, \
 		dcall-simple-server 1 360, \
 		dcall-simple-server 1 360, \
-		dcall-dup2-server 2 352, \
-		dcall-dup2-server 2 352, \
-		dcall-dup2-server 2 352, \
-		dcall-dup2-server 2 352, \
-		dcall-lightning-server 12 fast_count=3!tick_tock=1!measlat=0!window=2000 213, \
-		dcall-lightning-server 12 fast_count=3!tick_tock=1!measlat=0!window=2000 213, \
-		dcall-lightning-server 12 fast_count=3!tick_tock=1!measlat=0!window=2000 213, \
-		dcall-lightning-server 12 fast_count=3!tick_tock=1!measlat=0!window=2000 213, \
-		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 176, \
-		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 176, \
-		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 176, \
-		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 176. \
+		dcall-dup2-server 2 360, \
+		dcall-dup2-server 2 360, \
+		dcall-dup2-server 2 360, \
+		dcall-dup2-server 2 360, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=1!measlat=0!window=2000 233, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=1!measlat=0!window=2000 233, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=1!measlat=0!window=2000 233, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=1!measlat=0!window=2000 233, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 196, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 196, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 196, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 196. \
 		tor2 -f /etc/torrc_guard_12, \
 		tor2 -f /etc/torrc_guard_12, \
 		tor2 -f /etc/torrc_guard_12, \
@@ -976,10 +976,10 @@ jan_dcall_hardened:
 		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 360, \
 		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 360, \
 		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 360, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 311, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 311, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 311, \
-		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 311. \
+		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 331, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 331, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 331, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 331. \
 		dcall-simple-server 1 360, \
 		dcall-simple-server 1 360, \
 		dcall-simple-server 1 360, \
@@ -992,10 +992,10 @@ jan_dcall_hardened:
 		dcall-lightning-server 12 fast_count=3!tick_tock=1!measlat=0!window=2000 360, \
 		dcall-lightning-server 12 fast_count=3!tick_tock=1!measlat=0!window=2000 360, \
 		dcall-lightning-server 12 fast_count=3!tick_tock=1!measlat=0!window=2000 360, \
-		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 311, \
-		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 311, \
-		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 311, \
-		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 311. \
+		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 331, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 331, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 331, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 331. \
 		tor3 -f /etc/torrc_guard_2, \
 		tor3 -f /etc/torrc_guard_2, \
 		tor3 -f /etc/torrc_guard_2, \