diff --git a/scripts/Makefile b/scripts/Makefile
index c92c28a..96ad138 100644
--- a/scripts/Makefile
+++ b/scripts/Makefile
@@ -455,3 +455,236 @@ lightning-guards:
 		tor2 -f /etc/torrc_guard_9, \
 		tor2 -f /etc/torrc_guard_11, \
 		tor2 -f /etc/torrc_simple.
+
+
+jan_tor_analysis:
+	./run-3 \
+		8,tor_analysis. \
+		orig-client 135000 40 172, \
+		orig-client 113400 48 172, \
+		orig-client 91800 59 172, \
+		orig-client 70800 77 172, \
+		orig-client 48600 111 172, \
+		orig-client 27000 200 172, \
+		orig-client 5400 1000 172, \
+		orig-client 135000 40 172, \
+		orig-client 113400 48 172, \
+		orig-client 91800 59 172, \
+		orig-client 70800 77 172, \
+		orig-client 48600 111 172, \
+		orig-client 27000 200 172, \
+		orig-client 5400 1000 172, \
+		orig-client 135000 40 172, \
+		orig-client 113400 48 172, \
+		orig-client 91800 59 172, \
+		orig-client 70800 77 172, \
+		orig-client 48600 111 172, \
+		orig-client 27000 200 172, \
+		orig-client 5400 1000 172, \
+		orig-client 135000 40 172, \
+		orig-client 113400 48 172, \
+		orig-client 91800 59 172, \
+		orig-client 70800 77 172, \
+		orig-client 48600 111 172, \
+		orig-client 27000 200 172, \
+		orig-client 5400 1000 172, \
+		orig-client 135000 40 172, \
+		orig-client 113400 48 172, \
+		orig-client 91800 59 172, \
+		orig-client 70800 77 172, \
+		orig-client 48600 111 172, \
+		orig-client 27000 200 172, \
+		orig-client 5400 1000 172, \
+		orig-client 135000 40 172, \
+		orig-client 113400 48 172, \
+		orig-client 91800 59 172, \
+		orig-client 70800 77 172, \
+		orig-client 48600 111 172, \
+		orig-client 27000 200 172, \
+		orig-client 5400 1000 172, \
+		orig-client 135000 40 172, \
+		orig-client 113400 48 172, \
+		orig-client 91800 59 172, \
+		orig-client 70800 77 172, \
+		orig-client 48600 111 172, \
+		orig-client 27000 200 172, \
+		orig-client 5400 1000 172, \
+		orig-client 135000 40 172, \
+		orig-client 113400 48 172, \
+		orig-client 91800 59 172, \
+		orig-client 70800 77 172, \
+		orig-client 48600 111 172, \
+		orig-client 27000 200 172, \
+		orig-client 5400 1000 172. \
+		\
+		orig-server 135000 40 172, \
+		orig-server 113400 48 172, \
+		orig-server 91800 59 172, \
+		orig-server 70800 77 172, \
+		orig-server 48600 111 172, \
+		orig-server 27000 200 172, \
+		orig-server 5400 1000 172, \
+		orig-server 135000 40 172, \
+		orig-server 113400 48 172, \
+		orig-server 91800 59 172, \
+		orig-server 70800 77 172, \
+		orig-server 48600 111 172, \
+		orig-server 27000 200 172, \
+		orig-server 5400 1000 172, \
+		orig-server 135000 40 172, \
+		orig-server 113400 48 172, \
+		orig-server 91800 59 172, \
+		orig-server 70800 77 172, \
+		orig-server 48600 111 172, \
+		orig-server 27000 200 172, \
+		orig-server 5400 1000 172, \
+		orig-server 135000 40 172, \
+		orig-server 113400 48 172, \
+		orig-server 91800 59 172, \
+		orig-server 70800 77 172, \
+		orig-server 48600 111 172, \
+		orig-server 27000 200 172, \
+		orig-server 5400 1000 172, \
+		orig-server 135000 40 172, \
+		orig-server 113400 48 172, \
+		orig-server 91800 59 172, \
+		orig-server 70800 77 172, \
+		orig-server 48600 111 172, \
+		orig-server 27000 200 172, \
+		orig-server 5400 1000 172, \
+		orig-server 135000 40 172, \
+		orig-server 113400 48 172, \
+		orig-server 91800 59 172, \
+		orig-server 70800 77 172, \
+		orig-server 48600 111 172, \
+		orig-server 27000 200 172, \
+		orig-server 5400 1000 172, \
+		orig-server 135000 40 172, \
+		orig-server 113400 48 172, \
+		orig-server 91800 59 172, \
+		orig-server 70800 77 172, \
+		orig-server 48600 111 172, \
+		orig-server 27000 200 172, \
+		orig-server 5400 1000 172, \
+		orig-server 135000 40 172, \
+		orig-server 113400 48 172, \
+		orig-server 91800 59 172, \
+		orig-server 70800 77 172, \
+		orig-server 48600 111 172, \
+		orig-server 27000 200 172, \
+		orig-server 5400 1000 172. \
+		\
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1. \
+		\
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1, \
+		tor3 -f /etc/torrc_guard_1.
+
diff --git a/scripts/fastprobe.py b/scripts/fastprobe.py
index 64a3ce0..14a4bfe 100755
--- a/scripts/fastprobe.py
+++ b/scripts/fastprobe.py
@@ -7,6 +7,7 @@ groupmap = {"0": "fast", "1": "probe"}
 redmap = {"1": "orig", "0": "pad"}
 res = {}
 seen = set()
+vals = 0
 
 for line in sys.stdin:
     if "~ measlat ~" in line: 
@@ -20,8 +21,9 @@ for line in sys.stdin:
     red = redmap[m[5]]
     if (group, red) not in res: res[(group,red)] = 0
     res[(group,red)] += 1
+    vals += 1
 
 print("group,redundancy,count")
 for key,val in res.items():
     g,r = key
-    print(f"{g},{r},{val}")
+    print(f"{g},{r},{val/vals}")
diff --git a/scripts/run-3 b/scripts/run-3
index 0daa6af..5bab8cc 100755
--- a/scripts/run-3
+++ b/scripts/run-3
@@ -5,7 +5,7 @@
 
 die() { echo "$*" 1>&2 ; exit 1; }
 
-WAITFOR=1200 # 15min
+WAITFOR=7200 # 2 hours
 
 # SPLIT CLIENT AND SERVER TARGETS
 OLD_IFS=$IFS; IFS="."