diff --git a/basice2e/run.sh b/basice2e/run.sh
index fddc30d6ad648610d750a77eb00b85d56c5fc4ad..8eb4a7009227555734977c9b5f7321b3348dddbd 100755
--- a/basice2e/run.sh
+++ b/basice2e/run.sh
@@ -49,10 +49,14 @@ LASTNODE="localhost:50004"
 
 echo "STARTING CLIENTS..."
 CTR=0
-# for cid in 1 2 3 4; do
-#     for nid in 1 2 3 4; do
-for cid in 1; do
+
+for cid in 1 2 3 4; do
+    # TODO: Change the recipients to send multiple messages. We can't
+    #       run multiple clients with the same user id so we need
+    #       updates to make that work.
+    #     for nid in 1 2 3 4; do
     for nid in 1; do
+        nid=$((($cid % 4) + 1))
         ../bin/client --numnodes 5 -s $LASTNODE -i $cid -d $nid -m "Hello, $nid" > results/client$cid$nid.out 2>&1 &
         RETVAL=$!
         echo "../bin/client -s $LASTNODE -i $cid -d $nid -m \"Hello, $nid\" -- $RETVAL"
diff --git a/basice2e/server-1.yaml b/basice2e/server-1.yaml
index 9d94ec8259f6a3e74d75235fea82e0d36cf302ad..418cddbc597c3061e42544b757aabaab0edebd10 100644
--- a/basice2e/server-1.yaml
+++ b/basice2e/server-1.yaml
@@ -1,6 +1,6 @@
 logPath: "results/server-1.log"
 verbose: "false"
-batchSize: 1
+batchSize: 4
 servers:
     - 50000
     - 50001
diff --git a/basice2e/server-2.yaml b/basice2e/server-2.yaml
index 64da89d3ad8a066698091224dfbf2a682bd4f862..130b42283a6e00321692875b8939a3935448e35b 100644
--- a/basice2e/server-2.yaml
+++ b/basice2e/server-2.yaml
@@ -1,6 +1,6 @@
 logPath: "results/server-2.log"
 verbose: "false"
-batchSize: 1
+batchSize: 2
 servers:
     - 50000
     - 50001
diff --git a/basice2e/server-3.yaml b/basice2e/server-3.yaml
index b449830871b786d6c3e816d9b1e9df018e4f2a23..e63ad33f9e693fc476377a4b6d05e54930b92e23 100644
--- a/basice2e/server-3.yaml
+++ b/basice2e/server-3.yaml
@@ -1,6 +1,6 @@
 logPath: "results/server-3.log"
 verbose: "false"
-batchSize: 1
+batchSize: 4
 servers:
     - 50000
     - 50001
diff --git a/basice2e/server-4.yaml b/basice2e/server-4.yaml
index facb4ded3025c0e1020aecc5beaeaebc829e5263..1ef83e26bd00acea998e71d96d9ba6c75f8c885c 100644
--- a/basice2e/server-4.yaml
+++ b/basice2e/server-4.yaml
@@ -1,6 +1,6 @@
 logPath: "results/server-4.log"
 verbose: "false"
-batchSize: 1
+batchSize: 4
 servers:
     - 50000
     - 50001
diff --git a/basice2e/server-5.yaml b/basice2e/server-5.yaml
index 5fa055e6e424abafaac0f5702fd99f29d06a30dd..e4a2e0c1c7897e22bd0357ace25bedf7d6e94321 100644
--- a/basice2e/server-5.yaml
+++ b/basice2e/server-5.yaml
@@ -1,6 +1,6 @@
 logPath: "results/server-5.log"
 verbose: "false"
-batchSize: 1
+batchSize: 4
 servers:
     - 50000
     - 50001