diff --git a/Haas_Lathes_BIDC/Bechtel ST-20Y.cps b/Haas_Lathes_BIDC/Bechtel ST-20Y.cps
index 0f43a16..678eb24 100644
--- a/Haas_Lathes_BIDC/Bechtel ST-20Y.cps	
+++ b/Haas_Lathes_BIDC/Bechtel ST-20Y.cps	
@@ -76,7 +76,7 @@ properties = {
     description: "Output a tool list in the header of the code.",
     group: 0,
     type: "boolean",
-    value: true,
+    value: false,
     scope: "post"
   },
   writeVersion: {
@@ -350,6 +350,22 @@ properties = {
     type: "boolean",
     value: false,
     scope: "post"
+  },
+  measureToolsAtStart: {
+    title: "Tool Probing",
+    description: "Tool loading and probing. By turning this off, you accept responsibility for any resulting crashes.",
+    group: 99,
+    type: "boolean",
+    value: true,
+    scope: "post"
+  },
+  loadToolsAtStart: {
+    title: "Tool loading",
+    description: "Tool loading only. By turning this off, you accept responsibility for any resulting crashes.",
+    group: 99,
+    type: "boolean",
+    value: true,
+    scope: "post"
   }
 };
 
@@ -575,7 +591,7 @@ function getCompleteTool(holder, tool) {
   tool.shankWidth = toolSection.getParameter("operation:tool_shankWidth");
   tool.cuttingWidth = toolSection.getParameter("operation:tool_cuttingWidth");
   tool.holderOverallLength = toolSection.getParameter("operation:tool_holderOverallLength");
-  tool.threadPitch = toolSection.getParameter("operation:tool_threadPitch")
+  tool.threadPitch = toolSection.getParameter("operation:tool_threadPitch");
 
   if (holder == KM50R || holder == WBLOCK) {
     this.probeX = function() {