diff --git a/macros/main.cfg b/macros/main.cfg
index a43b2be..3013041 100644
--- a/macros/main.cfg
+++ b/macros/main.cfg
@@ -134,7 +134,7 @@ gcode:
     #PRINT_MIN={first_layer_print_min[0]},{first_layer_print_min[1]} PRINT_MAX={first_layer_print_max[0]},{first_layer_print_max[1]}
     {% set BED_TEMP = params.BED|default(60)|float %}
     {% set EXTRUDER_TEMP = params.EXTRUDER|default(210)|float %}
-    {% set CHAMBER = params.CHAMBER|default(35)|float %}    
+    {% set CHAMBER = params.CHAMBER|default(0)|float %}
     {% set use_purge = params.PURGE|default(0)|int %}
     {% if params.BED_TYPE %}
       INIT_BED_TYPE BED_TYPE="{params.BED_TYPE}"
@@ -144,7 +144,17 @@ gcode:
     M140 S{BED_TEMP}    
     M141 S{CHAMBER}    
     M109 S150
-    M190 S{BED_TEMP} 
+    M190 S{BED_TEMP}
+    {% if BED_TEMP > 90 %}
+      _NEVERMORE_ON
+    {% endif %}
+    {% if CHAMBER > 0 and printer["temperature_sensor Chamber"].temperature < CHAMBER %}
+      M117 Heat soak...
+      PARKBED                           ; nozzle low over the hot bed
+      M106 S102                         ; CPAP ~40% (x0.8 max_power) spreads bed heat
+      M191 S{CHAMBER}
+      M106 S0
+    {% endif %}
     BED_MESH_CLEAR
     G90 # Use absolute coordinates
     #SET_GCODE_OFFSET Z=0.0    
@@ -161,11 +171,8 @@ gcode:
     Smart_Park    
     M117 Heating...
     #M190 S{BED_TEMP}    
-    M109 S{EXTRUDER_TEMP}               ; M109 heat and wait for it to reach temp  
-    {% if BED_TEMP > 90 %}
-      _NEVERMORE_ON
-    {% endif %}
-    M117   
+    M109 S{EXTRUDER_TEMP}               ; M109 heat and wait for it to reach temp
+    M117
     STATUS_CLEANING
     {% if use_purge %}
       VORON_PURGE
@@ -229,7 +236,9 @@ gcode:
 gcode:
     {% set s = params.S|default(0)|float %}
     M141 S{s}
-    #TEMPERATURE_WAIT SENSOR="temperature_fan chamber" MINIMUM={s}  
+    {% if s > 0 %}
+      TEMPERATURE_WAIT SENSOR="temperature_sensor Chamber" MINIMUM={s}
+    {% endif %}