diff --git a/scripts/Makefile b/scripts/Makefile
index 4919d70..5e8028a 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -289,47 +289,47 @@ battle:
 		dup2-client 7500 40 172 2, \
 		dup2-client 7500 40 172 2, \
 		dup2-client 7500 40 172 2, \
-		lightning-client 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \
-		lightning-client 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \
-		lightning-client 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \
-		lightning-client 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \
-		lightning-client 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \
-		lightning-client 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000. \
+		lightning-client 7500 40 172 16 fast_count=4!tick_tock=1!measlat=1!window=2000, \
+		lightning-client 7500 40 172 16 fast_count=4!tick_tock=1!measlat=1!window=2000, \
+		lightning-client 7500 40 172 16 fast_count=4!tick_tock=1!measlat=1!window=2000, \
+		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=2000, \
+		lightning-client 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=2000. \
 		orig-server-single 7500 40 172, \
 		orig-server 7500 40 172, \
 		orig-server 7500 40 172, \
 		dup2-server-single 7500 40 172 2, \
 		dup2-server 7500 40 172 2, \
 		dup2-server 7500 40 172 2, \
-		lightning-server-single 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \
-		lightning-server 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \
-		lightning-server 7500 40 172 12 fast_count=3!tick_tock=1!measlat=1!window=2000, \
-		lightning-server-single 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \
-		lightning-server 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000, \
-		lightning-server 7500 40 172 12 fast_count=3!tick_tock=0!measlat=1!window=2000. \
-		tor2 -f /etc/torrc_guard_12, \
-		tor2 -f /etc/torrc_guard_12, \
+		lightning-server-single 7500 40 172 16 fast_count=4!tick_tock=1!measlat=1!window=2000, \
+		lightning-server 7500 40 172 16 fast_count=4!tick_tock=1!measlat=1!window=2000, \
+		lightning-server 7500 40 172 16 fast_count=4!tick_tock=1!measlat=1!window=2000, \
+		lightning-server-single 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=2000, \
+		lightning-server 7500 40 172 16 fast_count=4!tick_tock=0!measlat=1!window=2000. \
+		tor2 -f /etc/torrc_guard_16, \
+		tor2 -f /etc/torrc_guard_16, \
 		tor3 -f /etc/torrc_guard_3, \
-		tor2 -f /etc/torrc_guard_12, \
-		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_16, \
+		tor2 -f /etc/torrc_guard_16, \
 		tor3 -f /etc/torrc_guard_3, \
-		tor2 -f /etc/torrc_guard_12, \
-		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_16, \
+		tor2 -f /etc/torrc_guard_16, \
 		tor3 -f /etc/torrc_guard_3, \
-		tor2 -f /etc/torrc_guard_12, \
-		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_guard_16, \
+		tor2 -f /etc/torrc_guard_16, \
 		tor3 -f /etc/torrc_guard_3. \
-		tor2 -f /etc/torrc_single_hop_12, \
-		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_single_hop_16, \
+		tor2 -f /etc/torrc_guard_16, \
 		tor3 -f /etc/torrc_guard_3, \
-		tor2 -f /etc/torrc_single_hop_12, \
-		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_single_hop_16, \
+		tor2 -f /etc/torrc_guard_16, \
 		tor3 -f /etc/torrc_guard_3, \
-		tor2 -f /etc/torrc_single_hop_12, \
-		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_single_hop_16, \
+		tor2 -f /etc/torrc_guard_16, \
 		tor3 -f /etc/torrc_guard_3, \
-		tor2 -f /etc/torrc_single_hop_12, \
-		tor2 -f /etc/torrc_guard_12, \
+		tor2 -f /etc/torrc_single_hop_16, \
+		tor2 -f /etc/torrc_guard_16, \
 		tor3 -f /etc/torrc_guard_3.
 
 lightning-fastcount:
diff --git a/torrc_guard_16 b/torrc_guard_16
new file mode 100644
index 0000000..dd7248c
--- /dev/null
+++ b/torrc_guard_16
@@ -0,0 +1,6 @@
+ControlPort 9051
+UseEntryGuards 1
+NumEntryGuards 16
+NumPrimaryGuards 16
+SafeLogging 0
+#Log INFO stdout
diff --git a/torrc_single_hop_16 b/torrc_single_hop_16
new file mode 100644
index 0000000..964d7d1
--- /dev/null
+++ b/torrc_single_hop_16
@@ -0,0 +1,9 @@
+ControlPort 9051
+SOCKSPort 0
+UseEntryGuards 1
+NumEntryGuards 16
+NumPrimaryGuards 16
+SafeLogging 0
+HiddenServiceNonAnonymousMode 1
+HiddenServiceSingleHopMode 1
+#Log INFO stdout