diff --git a/scripts/orig-client b/scripts/orig-client
index 14e70bc..346b766 100755
--- a/scripts/orig-client
+++ b/scripts/orig-client
@@ -5,5 +5,5 @@ pushd $4/shared > /dev/null
 HS="`cat onion_services.pub | head -n1`.onion"
 popd > /dev/null
 
-measlat -h $HS -p 7500 -t tor > /dev/null 2> $4/log/client-bootstrap-stderr.log # Used to wait for connections
-measlat -h $HS -p 7500 -t tor -c $1 -i $2 -s $3 > $4/res/orig.csv 2> $4/log/client-measlat-stderr.log
+measlat -h $HS -p 7500 -t tor -r -s $3 > /dev/null 2> $4/log/client-bootstrap-stderr.log # Used to wait for connections
+measlat -h $HS -p 7500 -t tor -c $1 -i $2 -s $3 > $4/log/client-measlat-stdout.log 2> $4/log/client-measlat-stderr.log
diff --git a/scripts/orig-server b/scripts/orig-server
index 986ec9f..d3d9f28 100755
--- a/scripts/orig-server
+++ b/scripts/orig-server
@@ -1,4 +1,4 @@
 #!/bin/bash
 mkdir -p $2/{log,shared}
 cd $2/shared
-torecho -m -s $1 > ../log/server-udpecho-stdout.log 2> ../log/server-udpecho-stderr.log
+measlat -t tor -p 7500 -l -s $1 > ../log/server-measlat-stdout.log 2> ../log/server-measlat-stderr.log