diff --git a/Printed-Parts/scad/x-end-motor.scad b/Printed-Parts/scad/x-end-motor.scad
index f3989be..cbd600b 100755
--- a/Printed-Parts/scad/x-end-motor.scad
+++ b/Printed-Parts/scad/x-end-motor.scad
@@ -12,6 +12,28 @@ module x_end_motor_base(){
  translate(v=[-15,31,26.5]) cube(size = [17,44,53], center = true);
 }
 
+module x_end_motor_endstop_base(){
+    translate([-23.5,-28.5,58]){
+        difference(){
+            // Base block
+            cube([17,18.2,4]);
+            // Nice edge
+            translate([-1,10,10])rotate([-45,0,0])cube(20,20,20);
+            } 
+        }
+}
+
+module x_end_motor_endstop_holes(){
+    translate([-23.5,-28.5,58]){
+        translate([17/2,7.5,-3]){
+            // Back screw hole for endstop
+            translate([-4.75,0,0])cylinder(r=1,h=19,$fn=20);
+            // Front screw hole for endstop
+            translate([4.75,0,0])cylinder(r=1,h=19,$fn=20);
+            }
+        }
+}
+
 module x_end_motor_holes(){
  x_end_holes();
  // Position to place
@@ -21,16 +43,10 @@ module x_end_motor_holes(){
   // Motor mounting holes
   translate(v=[20,-15.5,-15.5]) rotate(a=[0,-90,0]) rotate(a=[0,0,90]) cylinder(h = 70, r=1.8, $fn=30);
   translate(v=[1,-15.5,-15.5]) rotate(a=[0,-90,0]) rotate(a=[0,0,90]) cylinder(h = 10, r=3.1, $fn=30);
- 
-
   translate(v=[20,-15.5,15.5]) rotate(a=[0,-90,0]) rotate(a=[0,0,90]) cylinder(h = 70, r=1.8, $fn=30);
   translate(v=[1,-15.5,15.5]) rotate(a=[0,-90,0]) rotate(a=[0,0,90]) cylinder(h = 10, r=3.1, $fn=30);
-
-
-  translate(v=[20,15.5,-15.5]) rotate(a=[0,-90,0]) rotate(a=[0,0,90]) cylinder(h = 70, r=1.8, $fn=30);
+   translate(v=[20,15.5,-15.5]) rotate(a=[0,-90,0]) rotate(a=[0,0,90]) cylinder(h = 70, r=1.8, $fn=30);
   translate(v=[1,15.5,-15.5]) rotate(a=[0,-90,0]) rotate(a=[0,0,90]) cylinder(h = 10, r=3.1, $fn=30);
-
-
   translate(v=[20,15.5,15.5]) rotate(a=[0,-90,0]) rotate(a=[0,0,90]) cylinder(h = 70, r=1.8, $fn=30);
   translate(v=[1,15.5,15.5]) rotate(a=[0,-90,0]) rotate(a=[0,0,90]) cylinder(h = 10, r=3.1, $fn=30);
 
@@ -47,9 +63,15 @@ module x_end_motor_holes(){
 // Final part
 module x_end_motor(){
  difference(){
-  x_end_motor_base();
+     union(){
+            x_end_motor_base();
+            x_end_motor_endstop_base();
+         }
+  
   x_end_motor_holes();
+  x_end_motor_endstop_holes();       
  }
+ 
 }
 
 x_end_motor();
\ No newline at end of file