diff --git a/Haas_Lathes_BIDC/haas st-20.cps b/Haas_Lathes_BIDC/haas st-20.cps
index 0f35c43..22feb97 100644
--- a/Haas_Lathes_BIDC/haas st-20.cps	
+++ b/Haas_Lathes_BIDC/haas st-20.cps	
@@ -559,17 +559,17 @@ function getCompleteTool(holder, tool) {
         }
         this.offsetType = "Indexible Drilling";
         this.x = function() {
-          return holder.x + tool.diameter*.15;
+          return holder.x + tool.diameter*.3;
         };
         this.z = function() {
-          return holder.z + (tool.getBodyLength() + tool.getHolderLength());
+          return holder.z + (tool.getBodyLength() + tool.getHolderLength() + holder.sOffset);
         };
         break;
 
       case TOOL_TURNING_THREADING:
         this.offsetType = "Threading";
         this.x = function() {
-          return holder.x + (tool.cuttingWidth - tool.shankWidth*.5);
+          return holder.x - (tool.cuttingWidth - tool.shankWidth*.5);
         };
         this.z = function() {
           return holder.z + (tool.holderOverallLength + holder.sOffset);
@@ -579,7 +579,7 @@ function getCompleteTool(holder, tool) {
         default:
           this.offsetType = "General Turning"
           this.x = function() {
-            return holder.x + tool.cuttingWidth*2;
+            return holder.x - tool.cuttingWidth*2;
           };
           this.z = function() {
             return holder.z + (tool.holderOverallLength + holder.sOffset);