diff --git a/cfgs/CALIBRATION.cfg b/cfgs/CALIBRATION.cfg
index 468c704..589b963 100644
--- a/cfgs/CALIBRATION.cfg
+++ b/cfgs/CALIBRATION.cfg
@@ -46,4 +46,4 @@ gcode:
     TEMPERATURE_WAIT SENSOR=heater_bed MINIMUM=60
     TEMPERATURE_WAIT SENSOR=extruder MINIMUM=180
     G28
-    BED_MESH_CALIBRATE
\ No newline at end of file
+    _BED_MESH_CALIBRATE
\ No newline at end of file
diff --git a/cfgs/misc-macros.cfg b/cfgs/misc-macros.cfg
index 0a696df..e10f800 100644
--- a/cfgs/misc-macros.cfg
+++ b/cfgs/misc-macros.cfg
@@ -29,13 +29,10 @@ gcode:
 variable_filament_sensor_enabled: 1 # NOTE Enable(1) or disable(0) the filament sensor, if one is connected
 variable_beeping_enabled: 1 # NOTE Enable(1) or disable(0) beeping everywhere except during gantry calibration
 variable_bed_temp_over: 10 # NOTE Start print if bed temperature is over by this amount, otherwise wait for temperature drop
+variable_kamp_enable: 1 # NOTE Enable(1) or disable(0) KAMP (adaptive mesh)
 variable_pre_purge_prime_length: 1.40
 gcode:
-    # DELETEME This section is unnecessary
-    SET_GCODE_VARIABLE MACRO=_globals VARIABLE=pre_purge_prime_length VALUE={ variable_pre_purge_prime_length }
-    SET_GCODE_VARIABLE MACRO=_globals VARIABLE=filament_sensor_enabled VALUE={ variable_filament_sensor_enabled }
-    SET_GCODE_VARIABLE MACRO=_globals VARIABLE=beeping_enabled VALUE={ variable_beeping_enabled }
-    SET_GCODE_VARIABLE MACRO=_globals VARIABLE=bed_temp_over VALUE={ variable_bed_temp_over }
+    # Don't delete this section
 
 [gcode_macro CONDITIONAL_BEEP]
 gcode:
@@ -122,6 +119,7 @@ gcode:
 
 [gcode_macro PRINT_START]
 gcode:
+    ADJUST_FILAMENT_SENSOR_STATUS ENABLE=1
     # Parameters
     {% set bedtemp = params.BED|int %}
     {% set hotendtemp = params.HOTEND|int %}
@@ -132,6 +130,7 @@ gcode:
     {% set bedtempOver = printer["gcode_macro _globals"].bed_temp_over|default(0)|int %}
     {% set maxVelocity = printer.configfile.settings.printer.max_velocity|default(200)|int %}
     {% set maxVelocityAdjusted =  (0.90 * maxVelocity * 60)|int %}
+    {% set kampEnabled=printer["gcode_macro _globals"].kamp_enable|default(0)|int %}
 
     {% if printer.configfile.settings.safe_z_home %}
         {% set startX = printer.configfile.settings.safe_z_home.home_xy_position[0]|float %}
@@ -149,9 +148,6 @@ gcode:
         {% endif %}
     {% endif %}
 
-    BED_MESH_PROFILE LOAD=default                        ; NOTE if not using a mesh, comment out this line
-    ADJUST_FILAMENT_SENSOR_STATUS ENABLE=1
-
     G90                                                  ; absolute positioning
     M140 S{bedtempAlmost}                                ; set & don't wait for bed temp
     M104 S{hotendtempStepOne}                            ; set & don't wait for hotend temp
@@ -165,8 +161,15 @@ gcode:
     M190 S{bedtemp}                                      ; set & wait for bed temp
     M140 S{bedtempSlicer}                                ; set & don't wait for bed temp ; set temp to sliced setting regardless
 
-    M104 S{hotendtemp}                                   ; set & don't wait for hotend temp
-    G28 Z                                                ; final z homing
+    {% if kampEnabled == 0 %}
+        BED_MESH_PROFILE LOAD=default                        ; NOTE if not using a mesh, comment out this line
+        M104 S{hotendtemp}                                   ; set & don't wait for hotend temp
+        G28 Z                                                ; final z homing
+    {% else %}
+        G28 Z                                                ; final z homing
+        BED_MESH_CALIBRATE                                   ; KAMP mesh
+        M104 S{hotendtemp}                                   ; set & don't wait for hotend temp
+    {% endif %}
 
     G1 X0 Y0 F{maxVelocityAdjusted}
     M109 S{hotendtemp}                                   ; set & wait for hotend temp