diff --git a/basice2e/clients.goldoutput/client18.txt b/basice2e/clients.goldoutput/client18.txt
index 8a619145b54ed0ba234e1198402566caf2074296..9be1b32dd0fbd4d9c6136b7038b1a59d8384353a 100644
--- a/basice2e/clients.goldoutput/client18.txt
+++ b/basice2e/clients.goldoutput/client18.txt
@@ -1,3 +1,3 @@
 Message from 9, Spencer Received: Hello, 18, with E2E Encryption
 Received: Hello, 18, with E2E Encryption
-Sending Message to 9, Spencer: Hello, 9, with E2E Encryption
+Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAk=, Spencer: Hello, 9, with E2E Encryption
diff --git a/basice2e/clients.goldoutput/client42.txt b/basice2e/clients.goldoutput/client42.txt
index e703c23d243adbf24187090d70e4b0d64977218f..f24f5d7143a769875f7eb6468e3d74c72f5cd4cf 100644
--- a/basice2e/clients.goldoutput/client42.txt
+++ b/basice2e/clients.goldoutput/client42.txt
@@ -1,2 +1,2 @@
+ Hello from Rick42, with E2E Encryption
 Received: Hello from Ben43, with E2E Encryption
-Sending Message to 0, : Hello from Rick42, with E2E Encryption
diff --git a/basice2e/clients.goldoutput/client43.txt b/basice2e/clients.goldoutput/client43.txt
index 2f39f09a51e12165f52414eec0d5186b50fa0d46..0463ff2a134e3775a7c738ee7b5011790c6250df 100644
--- a/basice2e/clients.goldoutput/client43.txt
+++ b/basice2e/clients.goldoutput/client43.txt
@@ -1,2 +1,2 @@
+ Hello from Ben43, with E2E Encryption
 Received: Hello from Rick42, with E2E Encryption
-Sending Message to 0, : Hello from Ben43, with E2E Encryption
diff --git a/basice2e/clients.goldoutput/client45.txt b/basice2e/clients.goldoutput/client45.txt
index b7b5025fa9044d512b291a9ff86fe107aa318b7a..bbbbb135dfccb8adebd471a1569d9400ee312cd3 100644
--- a/basice2e/clients.goldoutput/client45.txt
+++ b/basice2e/clients.goldoutput/client45.txt
@@ -1,3 +1,3 @@
 Message from 7, Rick Received: Hello, 4
 Received: Hello, 4
-Sending Message to 5, Ben: Hello, 5
+Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAU=, Ben: Hello, 5
diff --git a/basice2e/clients.goldoutput/client56.txt b/basice2e/clients.goldoutput/client56.txt
index 78d8019c8011f532a932684c754c2da272c80780..356b9a4cba30096034eedd16bf09d4958d2eb0a8 100644
--- a/basice2e/clients.goldoutput/client56.txt
+++ b/basice2e/clients.goldoutput/client56.txt
@@ -1,3 +1,3 @@
 Message from 4, Jim Received: Hello, 5
 Received: Hello, 5
-Sending Message to 6, Steph: Hello, 6
+Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAY=, Steph: Hello, 6
diff --git a/basice2e/clients.goldoutput/client67.txt b/basice2e/clients.goldoutput/client67.txt
index 4139df10d0f6ddd1cc6a76a995aca8ec351c4538..5c9fdd177772f3524d5c2fdd2ac0848188c5b5aa 100644
--- a/basice2e/clients.goldoutput/client67.txt
+++ b/basice2e/clients.goldoutput/client67.txt
@@ -1,3 +1,3 @@
 Message from 5, Ben Received: Hello, 6
 Received: Hello, 6
-Sending Message to 7, Rick: Hello, 7
+Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAc=, Rick: Hello, 7
diff --git a/basice2e/clients.goldoutput/client74.txt b/basice2e/clients.goldoutput/client74.txt
index 634534eaa2bbe82add4caa1af4fe415db6d90e86..c293c40cca584d480e5baa6805fe9d79e4d5387a 100644
--- a/basice2e/clients.goldoutput/client74.txt
+++ b/basice2e/clients.goldoutput/client74.txt
@@ -1,3 +1,3 @@
 Message from 6, Steph Received: Hello, 7
 Received: Hello, 7
-Sending Message to 4, Jim: Hello, 4
+Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQ=, Jim: Hello, 4
diff --git a/basice2e/clients.goldoutput/client9.txt b/basice2e/clients.goldoutput/client9.txt
index 5532a376f2d10e5242383f81da9695b9fbafb609..1314bc60142526f57bf21bac39fc4060f3b9c38d 100644
--- a/basice2e/clients.goldoutput/client9.txt
+++ b/basice2e/clients.goldoutput/client9.txt
@@ -1,3 +1,3 @@
 Message from 18, Bernardo Received: Hello, 9, with E2E Encryption
 Received: Hello, 9, with E2E Encryption
-Sending Message to 18, Bernardo: Hello, 18, with E2E Encryption
+Sending Message to AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABI=, Bernardo: Hello, 18, with E2E Encryption
diff --git a/basice2e/run.sh b/basice2e/run.sh
index c6df1387a051067b658dd5fa77819eff2ffd93a0..abfa2b5f277888af089ea0e28da37cc38863d431 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -215,8 +215,13 @@ rm $CLIENTCLEAN/client9_rekey.txt $CLIENTCLEAN/client18_rekey.txt || true
 
 strings $CLIENTCLEAN/client42.txt | grep -v "Timestamp" | grep -v "\.\.\." > $CLIENTCLEAN/client42-clean.txt || true
 strings $CLIENTCLEAN/client43.txt | grep -v "Timestamp" | grep -v "\.\.\." > $CLIENTCLEAN/client43-clean.txt || true
+strings $CLIENTCLEAN/client74.txt | grep -v "Timestamp" | grep -v "\.\.\." > $CLIENTCLEAN/client74-clean.txt || true
 mv $CLIENTCLEAN/client42-clean.txt $CLIENTCLEAN/client42.txt
 mv $CLIENTCLEAN/client43-clean.txt $CLIENTCLEAN/client43.txt
+mv $CLIENTCLEAN/client74-clean.txt $CLIENTCLEAN/client74.txt
+
+sed -i 's/Sending\ Message\ to\ .*,\ ://g' $CLIENTCLEAN/client42.txt
+sed -i 's/Sending\ Message\ to\ .*,\ ://g' $CLIENTCLEAN/client43.txt
 
 for C in $(ls -1 $CLIENTCLEAN); do
     sort -o tmp $CLIENTCLEAN/$C  || true