diff --git a/Haas_Gantry_BIDC/Bechtel SR.cps b/Haas_Gantry_BIDC/Bechtel SR.cps
index 5c32f4d..f42af14 100644
--- a/Haas_Gantry_BIDC/Bechtel SR.cps	
+++ b/Haas_Gantry_BIDC/Bechtel SR.cps	
@@ -638,20 +638,20 @@ function prepareForToolCheck() {
 }
 
 function BIDCWriteToolMeasureBlock(tool, rotating) {
-  writeBlock(gFormat.format(43), hFormat.format(tool.number), zOutput.format(tool.bodyLength + tool.holderLength));
+  writeBlock(gFormat.format(43), hFormat.format(tool.number));
   if (rotating) {
-    writeBlock(gFormat.format(59), gFormat.format(0), xOutput.format(0), yOutput.format(tool.diameter/2));
+    writeBlock(gFormat.format(59), gFormat.format(0), xOutput.format(-tool.diameter/2), yOutput.format(0));
     writeBlock(sOutput.format(400), mFormat.format(!tool.clockwise ? 3 : 4));
   } else {
     writeBlock(gFormat.format(59), gFormat.format(0), xOutput.format(0), yOutput.format(0));
   }
-  writeBlock(gFormat.format(37), hFormat.format(tool.number), zOutput.format(0), "F10.");
-  writeBlock(gFormat.format(91), gFormat.format(0), zOutput.format(.1), "F100.");
+  writeBlock(gFormat.format(37), hFormat.format(tool.number), zOutput.format(0), feedOutput.format(5));
+  writeBlock(gAbsIncModal.format(91), gFormat.format(0), zOutput.format(.1), feedOutput.format(100));
   if (rotating) {
     writeBlock(sOutput.format(800));
-    writeBlock(gFormat.format(4), "P1.");
   }
-  writeBlock(gFormat.format(37), hFormat.format(tool.number), zOutput.format(0), "F2.");
+  writeBlock(gFormat.format(37), hFormat.format(tool.number), zOutput.format(0), feedOutput.format(2));
+  writeBlock(gAbsIncModal.format(91), gFormat.format(0), zOutput.format(.1), feedOutput.format(100));
   onCommand(COMMAND_STOP_SPINDLE);
   writeRetract(Z);
 }
@@ -867,9 +867,7 @@ function onOpen() {
           }
           writeBlock("T" + toolFormat.format(tool.number), mFormat.format(6)); //Changes Tool
           writeBlock(gFormat.format(10), "L" + 10, "P" + tool.number, "R" + (tool.holderLength + tool.bodyLength).toFixed(4));
-          if (probeType == 3) {
-            writeBlock(gFormat.format(10), "L" + 12, "P" + tool.number, "R" + (tool.diameter).toFixed(4));
-          }
+          writeBlock(gFormat.format(10), "L" + 12, "P" + tool.number, "R" + (tool.diameter).toFixed(4));
           writeRetract(Z);
           writeBlock(gFormat.format(53), gFormat.format(0), xOutput.format(TOOL_CHANGE_X), yOutput.format(TOOL_CHANGE_Y));
           writeBlock(mFormat.format(0), formatComment("Load Tool " + tool.number)); //Pause until operator loads tool
@@ -3648,7 +3646,6 @@ function writeRetract() {
     switch (method) {
     case "G28":
       gMotionModal.reset();
-      gAbsIncModal.reset();
       writeBlock(gFormat.format(28), gAbsIncModal.format(91), words);
       writeBlock(gAbsIncModal.format(90));
       break;