diff --git a/automation/late_night_helper.yaml b/automation/late_night_helper.yaml
index 36af2535..cf20c98c 100755
--- a/automation/late_night_helper.yaml
+++ b/automation/late_night_helper.yaml
@@ -41,13 +41,10 @@
         brightness: 150
     - service: switch.turn_on
       entity_id: switch.kitchen_accents
-    - delay: '00:00:30'
     - service: switch.turn_on
       entity_id: switch.living_room_outlet
-    - delay: '00:00:30'
     - service: switch.turn_on
       entity_id: switch.foyer_outlet
-#    - delay: '00:08:00'
     - service: script.front_house_motion
     - service: light.turn_off
       entity_id: 
diff --git a/automation/sunrise_turnon_and_off.yaml b/automation/sunrise_turnon_and_off.yaml
index 0d7d337a..d597c5f8 100755
--- a/automation/sunrise_turnon_and_off.yaml
+++ b/automation/sunrise_turnon_and_off.yaml
@@ -7,6 +7,7 @@
     - platform: state
       entity_id: sun.sun
       state: 'below_horizon'
+      from: 'above_horizon'
       
   action:
     - service: switch.turn_on