diff --git a/scripts/Makefile b/scripts/Makefile
index 7f4ac7a..6c76f8f 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -723,38 +723,38 @@ jan_battle_normal:
 		lightning-server 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \
 		lightning-server 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \
 		lightning-server 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000. \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16. \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16.
+		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_battle_hardened:
 	./run-3 \
@@ -859,37 +859,44 @@ jan_battle_light:
 		lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \
 		lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \
 		lightning-server-single 135000 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000. \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16, \
-		tor2 -f /etc/torrc_guard_16. \
-		tor2 -f /etc/torrc_single_hop_16, \
-		tor2 -f /etc/torrc_single_hop_16, \
-		tor2 -f /etc/torrc_single_hop_16, \
-		tor2 -f /etc/torrc_single_hop_16, \
-		tor2 -f /etc/torrc_single_hop_16, \
-		tor2 -f /etc/torrc_single_hop_16, \
-		tor2 -f /etc/torrc_single_hop_16, \
-		tor2 -f /etc/torrc_single_hop_16, \
-		tor2 -f /etc/torrc_single_hop_16, \
-		tor2 -f /etc/torrc_single_hop_16, \
-		tor2 -f /etc/torrc_single_hop_16, \
-		tor2 -f /etc/torrc_single_hop_16, \
-		tor2 -f /etc/torrc_single_hop_16, \
-		tor2 -f /etc/torrc_single_hop_16, \
-		tor2 -f /etc/torrc_single_hop_16, \
-		tor2 -f /etc/torrc_single_hop_16.
+		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.
 
 
+jan_dcall_normal:
+	./run-3 \
+		1,jan_dcall_normal. \
+		dcall-lightning-client 12 fast_count=3!tick_tock=1!measlat=0!window=2000. \
+		dcall-lightning-server 12 fast_count=3!tick_tock=1!measlat=0!window=2000. \
+		tor2 -f /etc/torrc_guard_12. \
+		tor2 -f /etc/torrc_guard_12.