diff --git a/packages/presence.yaml b/packages/presence.yaml
index 15278d6..6ba09bb 100644
--- a/packages/presence.yaml
+++ b/packages/presence.yaml
@@ -718,6 +718,7 @@ automation:
               entity_id:
                 - input_boolean.front_porch_light_on
                 - input_boolean.audible_notifications
+                - input_boolean.master_bedroom_cooling_on
           - service: automation.turn_on
             target:
               entity_id:
@@ -745,6 +746,16 @@ automation:
                 - automation.vacation_lighting
             data:
               stop_actions: true
+          - if:
+            - condition: state
+              entity_id: binary_sensor.early_night_mode
+              state: 'on'
+            then:
+            - service: input_boolean.turn_on
+              target:
+                entity_id: input_boolean.master_bedroom_cooling_on
+          - delay:
+              seconds: 1
           - if:
             - condition: template
               value_template: >
@@ -760,28 +771,11 @@ automation:
             - service: fan.turn_on
               target:
                 entity_id:
-                  - fan.emma_air_conditioner
                   - fan.kallen_bedroom_fan
-            - service: climate.set_hvac_mode
-              target:
-                entity_id: climate.master_bedroom_aircon
-              data:
-                hvac_mode: cool
-            - service: climate.set_preset_mode
-              target:
-                entity_id: climate.master_bedroom_aircon
-              data:
-                preset_mode: eco
-            - service: climate.set_temperature
-              target:
-                entity_id: climate.master_bedroom_aircon
-              data:
-                temperature: "{{ states('input_number.master_bedroom_daytime_temp') | int }}"
-            - service: climate.set_fan_mode
-              target:
-                entity_id: climate.master_bedroom_aircon
-              data:
-                fan_mode: Auto
+                  - fan.emma_air_conditioner
+          - service: button.press
+            target:
+              entity_id: button.master_bedroom_climate_reset
           - if:
             - condition: template
               value_template: >