diff --git a/table.h b/table.h
index f49297ef..f8fe02c0 100644
--- a/table.h
+++ b/table.h
@@ -37,10 +37,10 @@ int getTableValue(struct table fromTable, int Y, int X)
     //Note: For the X axis specifically, rather than looping from tableAxisX[0] up to tableAxisX[max], we start at tableAxisX[Max] and go down. 
     //      This is because the important tables (fuel and injection) will have the highest RPM at the top of the X axis, so starting there will mean the best case occurs when the RPM is highest (And hence the CPU is needed most)
     int xMin = fromTable.axisX[0];
-    int xMax = fromTable.axisX[fromTable.xSize];
-    for (int x = fromTable.xSize; x > 0; x--)
+    int xMax = fromTable.axisX[fromTable.xSize-1];
+    for (int x = fromTable.xSize-1; x > 0; x--)
     {
-      if ( (X < fromTable.axisX[x]) && (X > fromTable.axisX[x-1]) )
+      if ( (X <= fromTable.axisX[x]) && (X >= fromTable.axisX[x-1]) )
       {
         xMax = fromTable.axisX[x];
         xMin = fromTable.axisX[x-1];
@@ -50,10 +50,10 @@ int getTableValue(struct table fromTable, int Y, int X)
     
     //Loop through the Y axis bins for the min/max pair
     int yMin = fromTable.axisY[0];
-    int yMax = fromTable.axisY[fromTable.ySize];
-    for (int y = fromTable.ySize; y > 0; y--)
+    int yMax = fromTable.axisY[fromTable.ySize-1];
+    for (int y = fromTable.ySize-1; y > 0; y--)
     {
-      if ( (Y < fromTable.axisY[y]) && (Y > fromTable.axisY[y-1]) )
+      if ( (Y >= fromTable.axisY[y]) && (Y <= fromTable.axisY[y-1]) )
       {
         yMax = fromTable.axisY[y];
         yMin = fromTable.axisY[y-1];
@@ -80,11 +80,13 @@ int getTableValue(struct table fromTable, int Y, int X)
     
     //Create some normalised position values
     float p = ((float)(X - xMin)) / (xMax - xMin);
-    float q = ((float)(Y - yMax)) / (yMax - yMin);
+    float q = ((float)(Y - yMax)) / (yMin - yMax);
     
-    float m = (1.0-p)(1.0-q);
+    float m = (1.0-p) * (1.0-q);
+    float n = p * (1-q);
+    float o = (1-p) * q;
+    float r = p * q;
     
     
-    
-    return 1; 
+    return ( (A * m) + (B * n) + (C * o) + (D * r) ); 
   }
diff --git a/testing.h b/testing.h
index 13de3f13..bbe96ff2 100644
--- a/testing.h
+++ b/testing.h
@@ -12,11 +12,33 @@ _____________________________________________
 | 63|
 | 50|
 | 38|
-| 25|
+| 25| 17 | 21 |
 | 13| 15 | 20 |
 |   | 500|1500|2000|2500|3000|4000|5000|6000| RPM
 
 This is a fairly standard 8x8 VE vs RPM 2D map
+Pass in:
+x = 1000
+y = 20
+
+yMax = 13
+yMin = 25
+
+xMax = 1500
+xMin = 500
+
+A 17
+B 21
+C 15
+D 20
+p (1000 - 500) / (1500 - 500) = 1/2 = 0.5
+q (20 - 13) / (25 - 13) = 7/12 = 0.583
+m (1 - 0.5) * (1 - 0.583) = 0.2083
+n 0.5 * (1 - 0.583) = 0.2083
+o (1 - 0.5) * 0.583 = 0.29166
+r (0.5 * 0.583) = 0.29166
+
+VE = ( (17 * 0.2083) + (21 * 0.2083) + (15 * 0.9166) + (20 * 0.29166) ) = 18.125
 
 */