diff --git a/lib/aos/aos_urpc.c b/lib/aos/aos_urpc.c
index 5bb47a0..71738a6 100644
--- a/lib/aos/aos_urpc.c
+++ b/lib/aos/aos_urpc.c
@@ -56,7 +56,7 @@ errval_t do_aos_urpc(
     // wait until the rpc call completes
     while(rpc->meta->call_in_progress) {
         // yield the thread because there might be useful stuff to do...
-        thread_yield();
+        // thread_yield();
     }
 
     // memory barrier
@@ -182,7 +182,7 @@ int urpc_server(void *arg) {
         while(urpc->meta->call_in_progress == false) {
             // sleep for a bit while there is nothing to do
             // barrelfish_usleep(100);
-            thread_yield();
+            // thread_yield();
         }
 
         // memory barrier
diff --git a/performance/performance_evaluation.py b/performance/performance_evaluation.py
index 169ed3a..e3f2daf 100644
--- a/performance/performance_evaluation.py
+++ b/performance/performance_evaluation.py
@@ -50,7 +50,7 @@ def build_dataseries(measurements, start_tag, end_tag):
                 datapoints.append(m["timestamp"] - started_at)
                 started_at = None
             elif m["tag"] == start_tag:
-                print("[ERROR] Invalid sequence, ignoring last start tag")
+                print(f"[ERROR] Invalid sequence, ignoring last start tag {start_tag}")
                 started_at = m["timestamp"]
     
     return datapoints
@@ -74,10 +74,10 @@ def main():
     # calculate stats for each data series
     metrics = {}
     for key in dataset:
-        # d_mean = mean(dataset[key])
+        d_mean = mean(dataset[key])
         d_std = std(dataset[key])
         d_median = median(dataset[key])
-        metrics[key] = (d_median, d_std)
+        metrics[key] = (d_mean, d_std)
 
     # create output directory
     os.makedirs(out_dir, exist_ok=True)
diff --git a/performance/plots/archive/urpc_empty_loop/client_to_server.jpg b/performance/plots/archive/urpc_empty_loop/client_to_server.jpg
new file mode 100644
index 0000000..566a947
Binary files /dev/null and b/performance/plots/archive/urpc_empty_loop/client_to_server.jpg differ
diff --git a/performance/plots/archive/urpc_empty_loop/metrics.jpg b/performance/plots/archive/urpc_empty_loop/metrics.jpg
new file mode 100644
index 0000000..93f91c9
Binary files /dev/null and b/performance/plots/archive/urpc_empty_loop/metrics.jpg differ
diff --git a/performance/plots/archive/urpc_empty_loop/performance.jpg b/performance/plots/archive/urpc_empty_loop/performance.jpg
new file mode 100644
index 0000000..bd08db6
Binary files /dev/null and b/performance/plots/archive/urpc_empty_loop/performance.jpg differ
diff --git a/performance/plots/archive/urpc_empty_loop/server_completed_task.jpg b/performance/plots/archive/urpc_empty_loop/server_completed_task.jpg
new file mode 100644
index 0000000..83f85ff
Binary files /dev/null and b/performance/plots/archive/urpc_empty_loop/server_completed_task.jpg differ
diff --git a/performance/plots/archive/urpc_empty_loop/server_schedule_task.jpg b/performance/plots/archive/urpc_empty_loop/server_schedule_task.jpg
new file mode 100644
index 0000000..10b5d3b
Binary files /dev/null and b/performance/plots/archive/urpc_empty_loop/server_schedule_task.jpg differ
diff --git a/performance/plots/archive/urpc_empty_loop/server_to_client.jpg b/performance/plots/archive/urpc_empty_loop/server_to_client.jpg
new file mode 100644
index 0000000..ad6a30d
Binary files /dev/null and b/performance/plots/archive/urpc_empty_loop/server_to_client.jpg differ
diff --git a/performance/plots/archive/urpc_yield_loop/client_to_server.jpg b/performance/plots/archive/urpc_yield_loop/client_to_server.jpg
new file mode 100644
index 0000000..4f96316
Binary files /dev/null and b/performance/plots/archive/urpc_yield_loop/client_to_server.jpg differ
diff --git a/performance/plots/archive/urpc_yield_loop/metrics.jpg b/performance/plots/archive/urpc_yield_loop/metrics.jpg
new file mode 100644
index 0000000..40392b5
Binary files /dev/null and b/performance/plots/archive/urpc_yield_loop/metrics.jpg differ
diff --git a/performance/plots/archive/urpc_yield_loop/performance.jpg b/performance/plots/archive/urpc_yield_loop/performance.jpg
new file mode 100644
index 0000000..aef77cc
Binary files /dev/null and b/performance/plots/archive/urpc_yield_loop/performance.jpg differ
diff --git a/performance/plots/archive/urpc_yield_loop/server_completed_task.jpg b/performance/plots/archive/urpc_yield_loop/server_completed_task.jpg
new file mode 100644
index 0000000..1c69a33
Binary files /dev/null and b/performance/plots/archive/urpc_yield_loop/server_completed_task.jpg differ
diff --git a/performance/plots/archive/urpc_yield_loop/server_schedule_task.jpg b/performance/plots/archive/urpc_yield_loop/server_schedule_task.jpg
new file mode 100644
index 0000000..673516f
Binary files /dev/null and b/performance/plots/archive/urpc_yield_loop/server_schedule_task.jpg differ
diff --git a/performance/plots/archive/urpc_yield_loop/server_to_client.jpg b/performance/plots/archive/urpc_yield_loop/server_to_client.jpg
new file mode 100644
index 0000000..a15117c
Binary files /dev/null and b/performance/plots/archive/urpc_yield_loop/server_to_client.jpg differ