diff --git a/Configuration.h b/Configuration.h
index f691811..f168fb3 100644
--- a/Configuration.h
+++ b/Configuration.h
@@ -352,11 +352,11 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o
 #define max_software_endstops true  // If true, axis won't move to coordinates greater than the defined lengths below.
 
 // Travel limits after homing
-#define X_MAX_POS 210  // ST for Geeetech Prusa I3 X
+#define X_MAX_POS 210  // @FeSt for Geeetech Prusa I3 X
 #define X_MIN_POS 0
-#define Y_MAX_POS 210  // ST for Geeetech Prusa I3 X
+#define Y_MAX_POS 210  // @FeSt for Geeetech Prusa I3 X
 #define Y_MIN_POS 0
-#define Z_MAX_POS 180  // ST for Geeetech Prusa I3 X
+#define Z_MAX_POS 180  // @FeSt for Geeetech Prusa I3 X
 #define Z_MIN_POS 0
 
 #define X_MAX_LENGTH (X_MAX_POS - X_MIN_POS)
@@ -364,7 +364,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o
 #define Z_MAX_LENGTH (Z_MAX_POS - Z_MIN_POS)
 //============================= Bed Auto Leveling ===========================
 
-//#define ENABLE_AUTO_BED_LEVELING // Delete the comment to enable (remove // at the start of the line) ST autobedleveling autoleveling
+#define ENABLE_AUTO_BED_LEVELING // Delete the comment to enable (remove // at the start of the line) @FeSt autobedleveling autoleveling
 #define Z_PROBE_REPEATABILITY_TEST  // If not commented out, Z-Probe Repeatability test will be included if Auto Bed Leveling is Enabled.
 
 #ifdef ENABLE_AUTO_BED_LEVELING
@@ -389,14 +389,14 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o
   #ifdef AUTO_BED_LEVELING_GRID
 
     // set the rectangle in which to probe
-    #define LEFT_PROBE_BED_POSITION 15    // ST:
-    #define RIGHT_PROBE_BED_POSITION 170   // ST:
-    #define BACK_PROBE_BED_POSITION 180  // ST:
+    #define LEFT_PROBE_BED_POSITION 30    // ST:
+    #define RIGHT_PROBE_BED_POSITION 200   // ST:
+    #define BACK_PROBE_BED_POSITION 147  // ST:
     #define FRONT_PROBE_BED_POSITION 20
 
      // set the number of grid points per dimension
      // I wouldn't see a reason to go above 3 (=9 probing points on the bed)
-    #define AUTO_BED_LEVELING_GRID_POINTS 3
+    #define AUTO_BED_LEVELING_GRID_POINTS 2
 
 
   #else  // not AUTO_BED_LEVELING_GRID
@@ -415,9 +415,9 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o
 
   // these are the offsets to the probe relative to the extruder tip (Hotend - Probe)
   // X and Y offsets must be integers
-  #define X_PROBE_OFFSET_FROM_EXTRUDER -18  // ST
-  #define Y_PROBE_OFFSET_FROM_EXTRUDER -44  // ST
-  #define Z_PROBE_OFFSET_FROM_EXTRUDER 0    // ST
+  #define X_PROBE_OFFSET_FROM_EXTRUDER 6  // ST
+  #define Y_PROBE_OFFSET_FROM_EXTRUDER -43  // ST
+  #define Z_PROBE_OFFSET_FROM_EXTRUDER -1.4    // ST
 
   #define Z_RAISE_BEFORE_HOMING 4       // (in mm) Raise Z before homing (G28) for Probe Clearance.  ST:
                                         // Be sure you have this distance over your Z_MAX_POS in case
@@ -764,6 +764,7 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o
 // If unsure, leave commented / disabled
 //
 //#define NUM_SERVOS 3 // Servo index starts with 0 for M280 command
+#define NUM_SERVOS 1 // @FeSt for Geeetech Prusa I3 X with 3D Touch Auto Leveling Sensor
 
 // Servo Endstops
 //
@@ -773,6 +774,9 @@ const bool Z_MAX_ENDSTOP_INVERTING = false; // set to true to invert the logic o
 //#define SERVO_ENDSTOPS {-1, -1, 0} // Servo index for X, Y, Z. Disable with -1
 //#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 70,0} // X,Y,Z Axis Extend and Retract angles
 
+#define SERVO_ENDSTOPS {-1, -1, 0} // @FeSt for Geeetech Prusa I3 X with 3D Touch Auto Leveling Sensor
+#define SERVO_ENDSTOP_ANGLES {0,0, 0,0, 10,90} // @FeSt for Geeetech Prusa I3 X with 3D Touch Auto Leveling Sensor
+
 /**********************************************************************\
  * Support for a filament diameter sensor
  * Also allows adjustment of diameter at print time (vs  at slicing)
diff --git a/pins.h b/pins.h
index 836e632..3173a82 100644
--- a/pins.h
+++ b/pins.h
@@ -1370,7 +1370,7 @@
 #define Z_STEP_PIN 37
 #define Z_DIR_PIN 39
 #define Z_MIN_PIN 30
-#define Z_MAX_PIN 32
+#define Z_MAX_PIN -1// 32 @FeSt
 #define Z_ENABLE_PIN 35
 
 #define HEATER_BED_PIN 4
@@ -1400,7 +1400,7 @@
 #define PS_ON_PIN          12
 #define KILL_PIN           -1
 #define SUICIDE_PIN        54  //PIN that has to be turned on right after start, to keep power flowing.
-#define SERVO0_PIN         13  // untested
+#define SERVO0_PIN         32  // @FeSt
 
 #ifdef ULTRA_LCD