diff --git a/gcode_macro.cfg b/gcode_macro.cfg
index b81ca47..ab08c34 100644
--- a/gcode_macro.cfg
+++ b/gcode_macro.cfg
@@ -18,7 +18,7 @@ variable_e_min_current: 0.27
 gcode:
 
 [gcode_macro AUTOTUNE_SHAPERS]
-variable_autotune_shapers: 'ei'
+#variable_autotune_shapers: 'ei'
 gcode:
 
 [gcode_macro LOAD_MATERIAL_CLOSE_FAN2]
@@ -364,7 +364,7 @@ gcode:
   M107 P1
   M107 P2
   END_PRINT_POINT
-  WAIT_TEMP_START
+  #WAIT_TEMP_START
   M84
 
 [gcode_macro FIRST_FLOOR_PAUSE]
@@ -495,18 +495,10 @@ gcode:
 
 [gcode_macro INPUTSHAPER]
 gcode:
-  SET_FILAMENT_SENSOR SENSOR=filament_sensor ENABLE=0
-  SET_FILAMENT_SENSOR SENSOR=filament_sensor_2 ENABLE=0
   G90
   G28
-  {% set POSITION_X = printer.configfile.settings['stepper_x'].position_max/2 %}
-  {% set POSITION_Y = printer.configfile.settings['stepper_y'].position_max/2 %}
-  G1 X{POSITION_X} Y{POSITION_Y} F6000
-  G1 Z10 F600
-  SHAPER_CALIBRATE AXIS=y
+  SHAPER_CALIBRATE
   CXSAVE_CONFIG
-  SET_FILAMENT_SENSOR SENSOR=filament_sensor ENABLE=1
-  SET_FILAMENT_SENSOR SENSOR=filament_sensor_2 ENABLE=1
 
 [gcode_macro BEDPID]
 gcode:
diff --git a/printer.cfg b/printer.cfg
index 6ab1339..d8a6fcc 100644
--- a/printer.cfg
+++ b/printer.cfg
@@ -164,10 +164,10 @@ sensor_type: EPCOS 100K B57560G104F
 sensor_pin: nozzle_mcu:PA0
 pressure_advance: 0.04
 pressure_advance_smooth_time: 0.040
-control: pid
-pid_Kp: 25.013
-pid_Ki: 2.566
-pid_Kd: 60.966
+#control: pid
+#pid_Kp: 25.013
+#pid_Ki: 2.566
+#pid_Kd: 60.966
 min_temp: 0
 max_temp: 320
 
@@ -308,9 +308,13 @@ tri_max_hold: 6000,60000
 speed: 150
 mesh_min: 5,5
 mesh_max: 215,215
-probe_count: 5,5
-fade_start: 5.0
-fade_end: 50.0
+probe_count: 9,9
+fade_start: 1.0
+fade_end: 10.0
+algorithm: bicubic
+bicubic_tension: 0.1
+
+[skew_correction]
 
 [display_status]
 
@@ -333,25 +337,29 @@ max_z_accel: 300
 #*# DO NOT EDIT THIS BLOCK OR BELOW. The contents are auto-generated.
 #*#
 #*# [input_shaper]
-#*# shaper_type_y = ei
-#*# shaper_freq_y = 69.0
-#*# shaper_type_x = ei
-#*# shaper_freq_x = 69.0
+#*# shaper_type_y = zv
+#*# shaper_freq_y = 53.0
+#*# shaper_type_x = mzv
+#*# shaper_freq_x = 56.4
 #*#
 #*# [bed_mesh default]
 #*# version = 1
 #*# points =
-#*# 	  0.777656, 0.707219, 0.650625, 0.573156, 0.576562
-#*# 	  0.502753, 0.429594, 0.356250, 0.354781, 0.202844
-#*# 	  0.288693, 0.157656, 0.050000, -0.006500, -0.096813
-#*# 	  0.036375, -0.050062, -0.155875, -0.307167, -0.389594
-#*# 	  -0.061563, -0.210438, -0.349781, -0.486781, -0.545415
-#*# x_count = 5
-#*# y_count = 5
+#*# 	0.016938, -0.005219, 0.023250, 0.032031, 0.057219, 0.066000, 0.121486, 0.120281, 0.192344
+#*# 	0.049969, 0.091469, 0.090313, 0.140094, 0.145094, 0.154094, 0.163875, 0.202875, 0.243500
+#*# 	-0.038938, -0.017156, 0.000031, 0.035562, 0.027125, 0.038750, 0.047656, 0.076938, 0.102875
+#*# 	0.037375, 0.001979, 0.054906, 0.013625, 0.079375, 0.061844, 0.072750, 0.069063, 0.092781
+#*# 	-0.005750, -0.016750, -0.010937, -0.000665, 0.051885, 0.049469, 0.059344, 0.048925, 0.083469
+#*# 	-0.007875, 0.009771, 0.004875, 0.022213, 0.066469, 0.015792, 0.009531, 0.047750, 0.081344
+#*# 	0.040000, 0.034375, 0.028344, 0.020844, 0.014188, 0.032844, 0.034406, 0.036187, 0.046151
+#*# 	0.088281, 0.077994, 0.059000, 0.064750, 0.032062, 0.049844, 0.050854, 0.051750, 0.042969
+#*# 	0.195219, 0.195406, 0.149813, 0.149531, 0.150187, 0.106844, 0.105938, 0.096594, 0.128656
+#*# x_count = 9
+#*# y_count = 9
 #*# mesh_x_pps = 2
 #*# mesh_y_pps = 2
-#*# algo = lagrange
-#*# tension = 0.2
+#*# algo = bicubic
+#*# tension = 0.1
 #*# min_x = 5.0
 #*# max_x = 215.0
 #*# min_y = 5.0
@@ -359,3 +367,9 @@ max_z_accel: 300
 #*#
 #*# [prtouch default]
 #*# version = 307
+#*#
+#*# [extruder]
+#*# control = pid
+#*# pid_kp = 46.337
+#*# pid_ki = 18.172
+#*# pid_kd = 29.539