diff --git a/scripts/Makefile b/scripts/Makefile
index b23ec89..b47a180 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -895,20 +895,204 @@ jan_battle_light:
 
 jan_dcall_normal:
 	./run-3 \
-		1,jan_dcall_normal. \
+		32,jan_dcall_normal. \
+		dcall-simple-client 1 360, \
+		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-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. \
 		tor2 -f /etc/torrc_guard_12, \
 		tor2 -f /etc/torrc_guard_12, \
 		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
 		tor2 -f /etc/torrc_guard_12. \
 		tor2 -f /etc/torrc_guard_12, \
 		tor2 -f /etc/torrc_guard_12, \
 		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
 		tor2 -f /etc/torrc_guard_12.
+
+jan_dcall_hardened:
+	./run-3 \
+		32,jan_dcall_hardened. \
+		dcall-simple-client 1 360, \
+		dcall-simple-client 1 360, \
+		dcall-simple-client 1 360, \
+		dcall-simple-client 1 360, \
+		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 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=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-simple-server 1 360, \
+		dcall-simple-server 1 360, \
+		dcall-simple-server 1 360, \
+		dcall-simple-server 1 360, \
+		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 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=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. \
+		tor3 -f /etc/torrc_guard_2, \
+		tor3 -f /etc/torrc_guard_2, \
+		tor3 -f /etc/torrc_guard_2, \
+		tor3 -f /etc/torrc_guard_2, \
+		tor3 -f /etc/torrc_guard_2, \
+		tor3 -f /etc/torrc_guard_2, \
+		tor3 -f /etc/torrc_guard_2, \
+		tor3 -f /etc/torrc_guard_2, \
+		tor3 -f /etc/torrc_guard_2, \
+		tor3 -f /etc/torrc_guard_2, \
+		tor3 -f /etc/torrc_guard_2, \
+		tor3 -f /etc/torrc_guard_2, \
+		tor3 -f /etc/torrc_guard_2, \
+		tor3 -f /etc/torrc_guard_2, \
+		tor3 -f /etc/torrc_guard_2, \
+		tor3 -f /etc/torrc_guard_2. \
+		tor3 -f /etc/torrc_guard_2, \
+		tor3 -f /etc/torrc_guard_2, \
+		tor3 -f /etc/torrc_guard_2, \
+		tor3 -f /etc/torrc_guard_2, \
+		tor3 -f /etc/torrc_guard_2, \
+		tor3 -f /etc/torrc_guard_2, \
+		tor3 -f /etc/torrc_guard_2, \
+		tor3 -f /etc/torrc_guard_2, \
+		tor3 -f /etc/torrc_guard_2, \
+		tor3 -f /etc/torrc_guard_2, \
+		tor3 -f /etc/torrc_guard_2, \
+		tor3 -f /etc/torrc_guard_2, \
+		tor3 -f /etc/torrc_guard_2, \
+		tor3 -f /etc/torrc_guard_2, \
+		tor3 -f /etc/torrc_guard_2, \
+		tor3 -f /etc/torrc_guard_2.
+
+jan_dcall_light:
+	./run-3 \
+		32,jan_dcall_light. \
+		dcall-simple-client 1 360, \
+		dcall-simple-client 1 360, \
+		dcall-simple-client 1 360, \
+		dcall-simple-client 1 360, \
+		dcall-dup2-client 2 355, \
+		dcall-dup2-client 2 355, \
+		dcall-dup2-client 2 355, \
+		dcall-dup2-client 2 355, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 198, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 198, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 198, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000 198, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 153, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 153, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 153, \
+		dcall-lightning-client 12 fast_count=3!tick_tock=0!measlat=0!window=2000 153. \
+		dcall-simple-server 1 360, \
+		dcall-simple-server 1 360, \
+		dcall-simple-server 1 360, \
+		dcall-simple-server 1 360, \
+		dcall-dup2-server 2 355, \
+		dcall-dup2-server 2 355, \
+		dcall-dup2-server 2 355, \
+		dcall-dup2-server 2 355, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=1!measlat=0!window=2000 198, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=1!measlat=0!window=2000 198, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=1!measlat=0!window=2000 198, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=1!measlat=0!window=2000 198, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 153, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 153, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 153, \
+		dcall-lightning-server 12 fast_count=3!tick_tock=0!measlat=0!window=2000 153. \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_12. \
+		tor2 -f /etc/torrc_single_hop_12, \
+		tor2 -f /etc/torrc_single_hop_12, \
+		tor2 -f /etc/torrc_single_hop_12, \
+		tor2 -f /etc/torrc_single_hop_12, \
+		tor2 -f /etc/torrc_single_hop_12, \
+		tor2 -f /etc/torrc_single_hop_12, \
+		tor2 -f /etc/torrc_single_hop_12, \
+		tor2 -f /etc/torrc_single_hop_12, \
+		tor2 -f /etc/torrc_single_hop_12, \
+		tor2 -f /etc/torrc_single_hop_12, \
+		tor2 -f /etc/torrc_single_hop_12, \
+		tor2 -f /etc/torrc_single_hop_12, \
+		tor2 -f /etc/torrc_single_hop_12, \
+		tor2 -f /etc/torrc_single_hop_12, \
+		tor2 -f /etc/torrc_single_hop_12, \
+		tor2 -f /etc/torrc_single_hop_12.