diff --git a/config-20250807-195608.zip b/config-20250807-195608.zip
deleted file mode 100644
index 6842ce8..0000000
Binary files a/config-20250807-195608.zip and /dev/null differ
diff --git a/firmware/octopus-pro.config b/firmware/octopus-pro.config
index 4d3f6d4..31eb564 100644
--- a/firmware/octopus-pro.config
+++ b/firmware/octopus-pro.config
@@ -71,6 +71,7 @@ CONFIG_STM32F0_TRIM=16
 # CONFIG_STM32_CANBUS_PA11_PA12 is not set
 # CONFIG_STM32_CANBUS_PA11_PB9 is not set
 # CONFIG_STM32_MMENU_CANBUS_PB8_PB9 is not set
+# CONFIG_STM32_MMENU_CANBUS_PB5_PB6 is not set
 # CONFIG_STM32_MMENU_CANBUS_PB12_PB13 is not set
 # CONFIG_STM32_MMENU_CANBUS_PD0_PD1 is not set
 # CONFIG_STM32_MMENU_CANBUS_PB0_PB1 is not set
@@ -78,6 +79,7 @@ CONFIG_STM32F0_TRIM=16
 # CONFIG_STM32_MMENU_CANBUS_PC2_PC3 is not set
 CONFIG_STM32_USBCANBUS_PA11_PA12=y
 # CONFIG_STM32_CMENU_CANBUS_PB8_PB9 is not set
+# CONFIG_STM32_CMENU_CANBUS_PB5_PB6 is not set
 # CONFIG_STM32_CMENU_CANBUS_PB12_PB13 is not set
 CONFIG_STM32_CMENU_CANBUS_PD0_PD1=y
 # CONFIG_STM32_CMENU_CANBUS_PB0_PB1 is not set
@@ -96,7 +98,6 @@ CONFIG_USB_SERIAL_NUMBER="12345"
 #
 # end of USB ids
 
-<<<<<<< HEAD
 CONFIG_WANT_ADC=y
 CONFIG_WANT_SPI=y
 CONFIG_WANT_SOFTWARE_SPI=y
@@ -109,37 +110,21 @@ CONFIG_WANT_NEOPIXEL=y
 CONFIG_WANT_PULSE_COUNTER=y
 CONFIG_WANT_ST7920=y
 CONFIG_WANT_HD44780=y
-=======
-CONFIG_WANT_GPIO_BITBANGING=y
-CONFIG_WANT_DISPLAYS=y
-CONFIG_WANT_THERMOCOUPLE=y
->>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
 CONFIG_WANT_ADXL345=y
 CONFIG_WANT_LIS2DW=y
 CONFIG_WANT_MPU9250=y
 CONFIG_WANT_ICM20948=y
-<<<<<<< HEAD
 CONFIG_WANT_THERMOCOUPLE=y
-=======
->>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
 CONFIG_WANT_HX71X=y
 CONFIG_WANT_ADS1220=y
 CONFIG_WANT_LDC1612=y
 CONFIG_WANT_SENSOR_ANGLE=y
-<<<<<<< HEAD
-=======
-CONFIG_WANT_SOFTWARE_I2C=y
-CONFIG_WANT_SOFTWARE_SPI=y
->>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
 CONFIG_NEED_SENSOR_BULK=y
+CONFIG_WANT_LOAD_CELL_PROBE=y
+CONFIG_NEED_SOS_FILTER=y
 CONFIG_CANBUS=y
 CONFIG_CANBUS_FREQUENCY=1000000
 CONFIG_INLINE_STEPPER_HACK=y
-<<<<<<< HEAD
-=======
-CONFIG_HAVE_STEPPER_OPTIMIZED_BOTH_EDGE=y
-CONFIG_WANT_STEPPER_OPTIMIZED_BOTH_EDGE=y
->>>>>>> 7bdc831c64e9cd32031a268cdce0910c4c7f23c9
 CONFIG_INITIAL_PINS="PE11"
 CONFIG_HAVE_GPIO=y
 CONFIG_HAVE_GPIO_ADC=y
diff --git a/firmware/octopus-pro.config.old b/firmware/octopus-pro.config.old
index 8a5a8be..18179dc 100644
--- a/firmware/octopus-pro.config.old
+++ b/firmware/octopus-pro.config.old
@@ -12,7 +12,7 @@ CONFIG_MACH_STM32=y
 # CONFIG_MACH_SIMU is not set
 CONFIG_BOARD_DIRECTORY="stm32"
 CONFIG_MCU="stm32h723xx"
-CONFIG_CLOCK_FREQ=400000000
+CONFIG_CLOCK_FREQ=520000000
 CONFIG_FLASH_SIZE=0x40000
 CONFIG_FLASH_BOOT_ADDRESS=0x8000000
 CONFIG_RAM_START=0x20000000
@@ -98,16 +98,23 @@ CONFIG_USB_SERIAL_NUMBER="12345"
 
 CONFIG_WANT_GPIO_BITBANGING=y
 CONFIG_WANT_DISPLAYS=y
-CONFIG_WANT_SENSORS=y
+CONFIG_WANT_THERMOCOUPLE=y
+CONFIG_WANT_ADXL345=y
 CONFIG_WANT_LIS2DW=y
-CONFIG_WANT_LDC1612=y
+CONFIG_WANT_MPU9250=y
+CONFIG_WANT_ICM20948=y
 CONFIG_WANT_HX71X=y
 CONFIG_WANT_ADS1220=y
+CONFIG_WANT_LDC1612=y
+CONFIG_WANT_SENSOR_ANGLE=y
 CONFIG_WANT_SOFTWARE_I2C=y
 CONFIG_WANT_SOFTWARE_SPI=y
 CONFIG_NEED_SENSOR_BULK=y
 CONFIG_CANBUS=y
 CONFIG_CANBUS_FREQUENCY=1000000
+CONFIG_INLINE_STEPPER_HACK=y
+CONFIG_HAVE_STEPPER_OPTIMIZED_BOTH_EDGE=y
+CONFIG_WANT_STEPPER_OPTIMIZED_BOTH_EDGE=y
 CONFIG_INITIAL_PINS="PE11"
 CONFIG_HAVE_GPIO=y
 CONFIG_HAVE_GPIO_ADC=y
@@ -116,6 +123,4 @@ CONFIG_HAVE_GPIO_I2C=y
 CONFIG_HAVE_GPIO_HARD_PWM=y
 CONFIG_HAVE_STRICT_TIMING=y
 CONFIG_HAVE_CHIPID=y
-CONFIG_HAVE_STEPPER_BOTH_EDGE=y
 CONFIG_HAVE_BOOTLOADER_REQUEST=y
-CONFIG_INLINE_STEPPER_HACK=y
diff --git a/macros/main.cfg b/macros/main.cfg
index 66ed458..57cc3b9 100644
--- a/macros/main.cfg
+++ b/macros/main.cfg
@@ -141,7 +141,7 @@ gcode:
     M117 Heating...
     #M190 S{BED_TEMP}    
     M109 S{EXTRUDER_TEMP}               ; M109 heat and wait for it to reach temp  
-    {% if BED_TEMP > 100 %}
+    {% if BED_TEMP > 90 %}
       _NEVERMORE_ON
     {% endif %}
     M117   
diff --git a/printer.cfg b/printer.cfg
index abd797b..ebe778e 100644
--- a/printer.cfg
+++ b/printer.cfg
@@ -215,19 +215,19 @@ algorithm: bicubic
 #*# [bed_mesh default]
 #*# version = 1
 #*# points =
-#*# 	  0.005312, 0.005625, 0.016875
-#*# 	  -0.001250, -0.008125, 0.015312
-#*# 	  0.016250, 0.004687, 0.022812
-#*# x_count = 3
+#*# 	  0.047812, 0.011875, 0.018437, 0.068750
+#*# 	  0.045312, 0.025312, 0.030625, 0.085937
+#*# 	  0.057500, 0.017812, 0.029375, 0.089062
+#*# x_count = 4
 #*# y_count = 3
 #*# mesh_x_pps = 2
 #*# mesh_y_pps = 2
 #*# algo = lagrange
 #*# tension = 0.2
-#*# min_x = 132.6
-#*# max_x = 217.0
-#*# min_y = 133.25
-#*# max_y = 217.07
+#*# min_x = 99.89129999999997
+#*# max_x = 270.62129999999996
+#*# min_y = 264.187
+#*# max_y = 283.447
 #*#
 #*# [probe]
-#*# z_offset = -0.850
+#*# z_offset = -0.835
diff --git a/toolhead_sb.cfg b/toolhead_sb.cfg
index aa887b0..d8ff907 100644
--- a/toolhead_sb.cfg
+++ b/toolhead_sb.cfg
@@ -36,10 +36,9 @@ hz_per_sec: 1
 [input_shaper]
 #max 4000 
 shaper_type_x:mzv 
-shaper_freq_x:53.800
+shaper_freq_x:53.400
 shaper_type_y:mzv 
-shaper_freq_y:42.400
-
+shaper_freq_y:42.200 
 
 [temperature_sensor SB2209]
 sensor_type: temperature_mcu