diff --git a/graph/graph.py b/graph/graph.py
index acf569a..7e8ee49 100644
--- a/graph/graph.py
+++ b/graph/graph.py
@@ -3,7 +3,6 @@ import re
 import statistics
 from collections import defaultdict
 
-import matplotlib.cm as cm
 import matplotlib.pyplot as plt
 import numpy as np
 from matplotlib.artist import setp
@@ -174,7 +173,7 @@ def matrixify(results: list, x_func: callable, y_func: callable, z_func: callabl
     x_labels = list(sorted(set(x_func(r) for r in results)))
     y_labels = list(sorted(set(y_func(r) for r in results)))
 
-    data = {y: {x: 1 for x in x_labels}
+    data = {y: {x: 0 for x in x_labels}
             for y in y_labels}
 
     for r in results:
@@ -200,7 +199,6 @@ def plot_scheme_heatmap(results: list, title: str, bandwidth: int):
         cbarlabel="Time (ms)",
         logcolor=True,
         origin="lower",
-        cmap=cm.gray
     )
     save_fig(plt, title)
 
@@ -221,7 +219,12 @@ def plot_old_vs_new_heatmap(all_results: dict, old_func: callable, new_func: cal
 
     def calc(i, j):
         try:
-            return data_new[i, j] - data_old[i, j]
+            if (data_new[i, j], data_old[i, j]) == (0, 0):
+                return 0
+            diff = data_new[i, j] - data_old[i, j]
+            if diff == 0:
+                return 1
+            return diff
         except IndexError:
             return 0
 
diff --git a/graph/plots/Computation_Time___1_bit_Block_Size.pdf b/graph/plots/Computation_Time___1_bit_Block_Size.pdf
index 1716fba..2df8d63 100644
Binary files a/graph/plots/Computation_Time___1_bit_Block_Size.pdf and b/graph/plots/Computation_Time___1_bit_Block_Size.pdf differ
diff --git a/graph/plots/Network_Traffic___1_bit_Block_Size.pdf b/graph/plots/Network_Traffic___1_bit_Block_Size.pdf
index 9968ed1..1918b74 100644
Binary files a/graph/plots/Network_Traffic___1_bit_Block_Size.pdf and b/graph/plots/Network_Traffic___1_bit_Block_Size.pdf differ
diff --git a/graph/plots/Total_Simulated_Time_Heatmap__Balanced_XOR___Varying_Database_Size_and_Block_Size___10Mbit_s.pdf b/graph/plots/Total_Simulated_Time_Heatmap__Balanced_XOR___Varying_Database_Size_and_Block_Size___10Mbit_s.pdf
index 3233059..8467ce2 100644
Binary files a/graph/plots/Total_Simulated_Time_Heatmap__Balanced_XOR___Varying_Database_Size_and_Block_Size___10Mbit_s.pdf and b/graph/plots/Total_Simulated_Time_Heatmap__Balanced_XOR___Varying_Database_Size_and_Block_Size___10Mbit_s.pdf differ
diff --git a/graph/plots/Total_Simulated_Time_Heatmap__Send_All___Varying_Database_Size_and_Block_Size___10Mbit_s.pdf b/graph/plots/Total_Simulated_Time_Heatmap__Send_All___Varying_Database_Size_and_Block_Size___10Mbit_s.pdf
index d1e70d3..92b7e8d 100644
Binary files a/graph/plots/Total_Simulated_Time_Heatmap__Send_All___Varying_Database_Size_and_Block_Size___10Mbit_s.pdf and b/graph/plots/Total_Simulated_Time_Heatmap__Send_All___Varying_Database_Size_and_Block_Size___10Mbit_s.pdf differ
diff --git a/graph/plots/Total_Simulated_Time_Heatmap__Send_All_vs_Balanced_XOR___Varying_Database_Size_and_Block_Size___10_Mbit_s.pdf b/graph/plots/Total_Simulated_Time_Heatmap__Send_All_vs_Balanced_XOR___Varying_Database_Size_and_Block_Size___10_Mbit_s.pdf
index 88ddd69..6d65b8f 100644
Binary files a/graph/plots/Total_Simulated_Time_Heatmap__Send_All_vs_Balanced_XOR___Varying_Database_Size_and_Block_Size___10_Mbit_s.pdf and b/graph/plots/Total_Simulated_Time_Heatmap__Send_All_vs_Balanced_XOR___Varying_Database_Size_and_Block_Size___10_Mbit_s.pdf differ
diff --git a/graph/plots/Total_Simulated_Time_Heatmap__XOR___Varying_Database_Size_and_Block_Size___10Mbit_s.pdf b/graph/plots/Total_Simulated_Time_Heatmap__XOR___Varying_Database_Size_and_Block_Size___10Mbit_s.pdf
index ec53c2f..728c93e 100644
Binary files a/graph/plots/Total_Simulated_Time_Heatmap__XOR___Varying_Database_Size_and_Block_Size___10Mbit_s.pdf and b/graph/plots/Total_Simulated_Time_Heatmap__XOR___Varying_Database_Size_and_Block_Size___10Mbit_s.pdf differ
diff --git a/graph/plots/Total_Simulated_Time_Heatmap__XOR_vs_Balanced_XOR___Varying_Database_Size_and_Block_Size___10_Mbit_s.pdf b/graph/plots/Total_Simulated_Time_Heatmap__XOR_vs_Balanced_XOR___Varying_Database_Size_and_Block_Size___10_Mbit_s.pdf
index afc5cea..461aa35 100644
Binary files a/graph/plots/Total_Simulated_Time_Heatmap__XOR_vs_Balanced_XOR___Varying_Database_Size_and_Block_Size___10_Mbit_s.pdf and b/graph/plots/Total_Simulated_Time_Heatmap__XOR_vs_Balanced_XOR___Varying_Database_Size_and_Block_Size___10_Mbit_s.pdf differ
diff --git a/graph/plots/Total_Time_with_Simulated_Bandwidth___1_bit_Block_Size.pdf b/graph/plots/Total_Time_with_Simulated_Bandwidth___1_bit_Block_Size.pdf
index 18abcfa..f6403a1 100644
Binary files a/graph/plots/Total_Time_with_Simulated_Bandwidth___1_bit_Block_Size.pdf and b/graph/plots/Total_Time_with_Simulated_Bandwidth___1_bit_Block_Size.pdf differ
diff --git a/graph/util.py b/graph/util.py
index 6f3f5da..9633602 100644
--- a/graph/util.py
+++ b/graph/util.py
@@ -28,6 +28,7 @@ def heatmap(data, row_labels, col_labels, ax=None,
     **kwargs
         All other arguments are forwarded to `imshow`.
     """
+    data = np.ma.masked_where(data == 0, data)
 
     if not ax:
         ax = plt.gca()
@@ -39,7 +40,7 @@ def heatmap(data, row_labels, col_labels, ax=None,
     if logcolor:
         pcm = ax.pcolor(data,
                         norm=colors.LogNorm(vmin=data.min(), vmax=data.max()),
-                        cmap='gray_r')
+                        cmap='Blues')
         cbar = ax.figure.colorbar(pcm, ax=ax, extend="max", ticks=LogLocator(base=2), format=LogFormatterSciNotation(base=2))
     elif sym_logcolor:
         linthresh = 1.0
@@ -76,9 +77,12 @@ def heatmap(data, row_labels, col_labels, ax=None,
 
     ax.set_xticks(np.arange(data.shape[1]+1)-.5, minor=True)
     ax.set_yticks(np.arange(data.shape[0]+1)-.5, minor=True)
-    ax.grid(which="minor", color="w", linestyle='-', linewidth=3)
     ax.tick_params(which="minor", bottom=False, left=False)
 
+    ax.patch.set(hatch="xx", edgecolor="gray")
+
+    ax.grid(which="minor", color="w", linestyle='-', linewidth=0)  # set linewidth=0.1 if annotating
+    #annotate_heatmap(im, data, fontsize=2)
     return im, cbar
 
 
diff --git a/pir/src/main/java/dk/au/pir/Driver.java b/pir/src/main/java/dk/au/pir/Driver.java
index 8fe33e8..6b12f39 100644
--- a/pir/src/main/java/dk/au/pir/Driver.java
+++ b/pir/src/main/java/dk/au/pir/Driver.java
@@ -103,7 +103,7 @@ public class Driver {
         }
 
         try {
-            boolean interPolySchemeShouldFuckOff = false;
+            boolean interPolySchemeShouldFuckOff = true;
             if (numServers != 1 && !interPolySchemeShouldFuckOff) {
                 try {
                     profiler.reset();