diff --git a/config/packages/devices/living_room/toshiba_ac.yaml b/config/packages/devices/living_room/toshiba_ac.yaml
index 17b990b..185b909 100644
--- a/config/packages/devices/living_room/toshiba_ac.yaml
+++ b/config/packages/devices/living_room/toshiba_ac.yaml
@@ -71,41 +71,44 @@ script:
           message: "AC · Switching on · Above 24 degrees, windows closed"
           domain: climate
 
+  toshiba_ac_on_cool_if_hot:
+    sequence:
+      - condition: and
+        conditions:
+          - condition: numeric_state
+            entity_id: sensor.trisensor_temperature
+            above: 23
+          - condition: numeric_state
+            entity_id: sensor.dark_sky_apparent_temperature
+            above: 23
+          - condition: state
+            entity_id: input_boolean.georgi_home
+            state: "on"
+          - condition: state
+            entity_id: binary_sensor.living_room_right_window
+            state: "off"
+          - condition: state
+            entity_id: group.bedroom_windows
+            state: "off"
+          - condition: state
+            entity_id: climate.toshiba_ac
+            state: "off"
+      - service: script.toshiba_ac_on_cool
+
 automation:
   - alias: Climate · AC · Turn on if hot
     trigger:
       - platform: numeric_state
         entity_id: sensor.trisensor_temperature
-        above: 24
+        above: 23
       - platform: state
         entity_id:
           - binary_sensor.living_room_right_window
           - group.bedroom_windows
         from: "on"
         to: "off"
-    condition:
-      condition: and
-      conditions:
-        - condition: numeric_state
-          entity_id: sensor.trisensor_temperature
-          above: 24
-        - condition: numeric_state
-          entity_id: sensor.dark_sky_apparent_temperature
-          above: 24
-        - condition: state
-          entity_id: input_boolean.georgi_home
-          state: "on"
-        - condition: state
-          entity_id: binary_sensor.living_room_right_window
-          state: "off"
-        - condition: state
-          entity_id: group.bedroom_windows
-          state: "off"
-        - condition: state
-          entity_id: climate.toshiba_ac
-          state: "off"
     action:
-      - service: script.toshiba_ac_on_cool
+      - service: script.toshiba_ac_on_cool_if_hot
 
   - alias: Climate · AC · Turn off
     trigger:
@@ -120,7 +123,7 @@ automation:
       - platform: state
         entity_id:
           - binary_sensor.living_room_right_window
-          - binary_sensor.bedroom_right_window
+          - group.bedroom_windows
         from: "off"
         to: "on"
     condition:
diff --git a/config/packages/routines/coming_home.yaml b/config/packages/routines/coming_home.yaml
index d3104b9..f014111 100644
--- a/config/packages/routines/coming_home.yaml
+++ b/config/packages/routines/coming_home.yaml
@@ -17,6 +17,7 @@ script:
           brightness_pct: 100
       - service: script.security_camera_off
       - service: script.routine_coming_home_after_sunset
+      - service: script.toshiba_ac_on_cool_if_hot
       - service: script.sonos_join_bedroom
       - service: script.routine_coming_home_welcome_home
 
@@ -25,6 +26,7 @@ script:
     sequence:
       - condition: sun
         after: sunset
+        after_offset: "-01:00:00"
       - service: light.turn_on
         entity_id: light.on_after_dark
         data: