diff --git a/printer_new122020.conf b/printer_new122020.conf
index d15028b..f4e6378 100644
--- a/printer_new122020.conf
+++ b/printer_new122020.conf
@@ -3,6 +3,8 @@
 # X,Y and Z are TMC2208 in UART Mode. 
 # E is an TMC2209
 # BLTouch
+# klipper v0.9.1-139-ga5ebe582
+# mainsail v0.3.0
 #####################################################################################
 
 [printer]
@@ -18,7 +20,7 @@ max_z_accel: 150
 uart_pin: P1.17
 microsteps: 16
 interpolate: True
-run_current: 0.7
+run_current: 0.65
 hold_current: 0.5
 stealthchop_threshold: 600
 driver_PWM_AUTOGRAD: True
@@ -31,7 +33,7 @@ step_pin: P2.2
 dir_pin: !P2.6
 enable_pin: !P2.1
 rotation_distance: 40
-#step_distance: .0125
+# step_distance: .0125
 endstop_pin: P1.29
 position_endstop: 0
 position_min: 0
@@ -44,7 +46,7 @@ homing_speed: 50
 uart_pin: P1.15
 microsteps: 16
 interpolate: True
-run_current: 0.7
+run_current: 0.65
 hold_current: 0.5
 stealthchop_threshold: 600
 driver_PWM_AUTOGRAD: True
@@ -57,7 +59,7 @@ step_pin: P0.19
 dir_pin: !P0.20
 enable_pin: !P2.8
 rotation_distance: 40
-#step_distance: .0125
+# step_distance: .0125
 endstop_pin: P1.27
 position_endstop: -9 #0
 position_min: -10
@@ -70,7 +72,7 @@ homing_speed: 50
 uart_pin: P1.10
 microsteps: 16
 interpolate: True
-run_current: 0.7
+run_current: 0.65
 hold_current: 0.5
 stealthchop_threshold: 200
 driver_PWM_AUTOGRAD: True
@@ -83,10 +85,10 @@ step_pin: P0.22
 dir_pin: P2.11
 enable_pin: !P0.21
 rotation_distance: 8
-#step_distance: .0025
+# step_distance: .0025
 endstop_pin: P1.25
 endstop_pin: probe:z_virtual_endstop
-position_endstop: 0
+#position_endstop: 0
 position_min: -1
 position_max: 250
 homing_retract_dist: 10 # to fix bltouch clone error
@@ -97,8 +99,7 @@ uart_pin: P1.8
 microsteps: 16
 interpolate: False
 hold_current: 0.5
-run_current: 0.95
-#gear_ratio: 3:1
+run_current: 0.75
 stealthchop_threshold: 250
 #driver_PWM_AUTOGRAD: True
 #driver_PWM_AUTOSCALE: True
@@ -113,18 +114,23 @@ beta: 4267
 step_pin: P2.13
 dir_pin: !P0.11
 enable_pin: !P2.12
+#0.00926 stock extruder #0.002409
 rotation_distance: 7.18450
-#0.00926 stock extruder #0.002409 
-#step_distance: 0.002245188 
+# step_distance: 0.002245188 
 nozzle_diameter: 0.400
 filament_diameter: 1.750
 heater_pin: P2.7
 sensor_type: 104NT-4-R025H42G #EPCOS 100K B57560G104F
 sensor_pin: P0.24
+#control: pid
+#pid_Kp: 22.2
+#pid_Ki: 1.08
+#pid_Kd: 114
 min_temp: 0
 max_temp: 290
 pressure_advance: 0.23
-max_extrude_only_velocity: 100
+#max_extrude_only_velocity: 120
+#max_extrude_only_accel: 1000
 
 
 #####################################################################################
@@ -165,7 +171,7 @@ control_pin: P2.0
 #pin_up_touch_mode_reports_triggered: False
 x_offset: 11.684 #-60
 y_offset: 40.199 #-13
-z_offset:  3.1 #2.9
+z_offset:  2.9 #2.9
 samples: 2
 #speed: 3
 
@@ -198,6 +204,42 @@ gcode:
     PID_CALIBRATE HEATER=extruder TARGET=210
     SAVE_CONFIG
 
+[gcode_macro PAUSE]
+rename_existing: BASE_PAUSE
+default_parameter_X: 230    #edit to your park position
+default_parameter_Y: 230    #edit to your park position
+default_parameter_Z: 10     #edit to your park position
+default_parameter_E: 1      #edit to your retract length
+gcode:
+    SAVE_GCODE_STATE NAME=PAUSE_state
+    BASE_PAUSE
+    G91
+    G1 E-{E} F2100
+    G1 Z{Z}
+    G90
+    G1 X{X} Y{Y} F6000
+
+[gcode_macro RESUME]
+rename_existing: BASE_RESUME
+default_parameter_E: 1      #edit to your retract length
+gcode:
+    G91
+    G1 E{E} F2100
+    G90
+    RESTORE_GCODE_STATE NAME=PAUSE_state MOVE=1
+    BASE_RESUME
+
+[pause_resume]
+
+[display_status]
+
+[gcode_macro CANCEL_PRINT]
+rename_existing: BASE_CANCEL_PRINT
+gcode:
+    TURN_OFF_HEATERS
+    CLEAR_PAUSE
+    SDCARD_RESET_FILE
+    BASE_CANCEL_PRINT
 
 [bed_mesh]
 speed: 100
@@ -226,41 +268,41 @@ serial: /dev/serial/by-id/usb-Klipper_lpc1768_09A0FF10031436AF84F46A5BC72000F5-i
 #*# [bed_mesh default]
 #*# version = 1
 #*# points =
-#*# 	0.201250, 0.036250, -0.055000, -0.187500
-#*# 	0.211250, 0.065000, -0.022500, -0.175000
-#*# 	0.322500, 0.177500, 0.051250, -0.130000
-#*# 	0.400000, 0.237500, 0.091250, -0.112500
+#*# 	  -0.177500, -0.145000, 0.010000, -0.015000
+#*# 	  -0.122500, -0.120000, 0.015000, -0.035000
+#*# 	  -0.082500, -0.055000, 0.053750, -0.037500
+#*# 	  -0.027500, -0.018750, 0.065000, 0.010000
 #*# tension = 0.2
-#*# min_x = -3.0
+#*# min_x = 19.994
 #*# algo = bicubic
 #*# y_count = 4
 #*# mesh_y_pps = 2
-#*# min_y = 20.0
+#*# min_y = 94.999
 #*# x_count = 4
-#*# max_y = 206.99
+#*# max_y = 229.999
 #*# mesh_x_pps = 2
-#*# max_x = 159.99
+#*# max_x = 224.984
 #*#
 #*# [bed_mesh new]
 #*# version = 1
 #*# points =
-#*# 	0.201250, 0.036250, -0.055000, -0.187500
-#*# 	0.211250, 0.065000, -0.022500, -0.175000
-#*# 	0.322500, 0.177500, 0.051250, -0.130000
-#*# 	0.400000, 0.237500, 0.091250, -0.112500
+#*# 	  -0.177500, -0.145000, 0.010000, -0.015000
+#*# 	  -0.122500, -0.120000, 0.015000, -0.035000
+#*# 	  -0.082500, -0.055000, 0.053750, -0.037500
+#*# 	  -0.027500, -0.018750, 0.065000, 0.010000
 #*# tension = 0.2
-#*# min_x = -3.0
+#*# min_x = 19.994
 #*# algo = bicubic
 #*# y_count = 4
 #*# mesh_y_pps = 2
-#*# min_y = 20.0
+#*# min_y = 94.999
 #*# x_count = 4
-#*# max_y = 206.99
+#*# max_y = 229.999
 #*# mesh_x_pps = 2
-#*# max_x = 159.99
+#*# max_x = 224.984
 #*#
 #*# [extruder]
 #*# control = pid
-#*# pid_kp = 22.427
-#*# pid_ki = 1.168
-#*# pid_kd = 107.652
\ No newline at end of file
+#*# pid_kp = 21.448
+#*# pid_ki = 0.953
+#*# pid_kd = 120.647