diff --git a/automation/Speech/door_opened.yaml b/automation/Speech/door_opened.yaml
index 259535c4..8e7320db 100755
--- a/automation/Speech/door_opened.yaml
+++ b/automation/Speech/door_opened.yaml
@@ -1,21 +1,29 @@
 ######################################################################
-##  Garage Status Announcements
+##  Door Open Announcements
 ######################################################################
 - alias: 'Door Opened'
 
   trigger:
     - platform: state
       entity_id:
-        - binary_sensor.mcu2_gpio5 # back door #
+        - binary_sensor.mcu1_gpio5 # Front door #
+        - binary_sensor.mcu2_gpio5 # Back door #
         - binary_sensor.MCU2_GPIO12 # Main Slider
         - binary_sensor.MCU1_GPIO12 # Interior Garage Door #
-      to: 'Opened'
-      for:
-        minutes: 2
+      from: 'off'
+
+  condition:
+    - condition: state
+      entity_id: binary_sensor.sleepnumber_carlo_carlo_is_in_bed
+      state: 'on'
+    - condition: state
+      entity_id: binary_sensor.sleepnumber_carlo_stacey_is_in_bed
+      state: 'on'
 
   action:
     - service: script.notify_engine
       data_template:
+        who: "parents"
         value1: "The {{ trigger.to_state.attributes.friendly_name }} has been {{ (trigger.to_state.state)|replace('_', ' ') }}."
 
     - service: input_boolean.turn_on
diff --git a/automation/System/CucKoo_Clock.yaml b/automation/System/CucKoo_Clock.yaml
index 5ae75f98..2f62fdbe 100755
--- a/automation/System/CucKoo_Clock.yaml
+++ b/automation/System/CucKoo_Clock.yaml
@@ -32,8 +32,6 @@
       data:
         media_player: 'media_player.livingroomcc'
         volume_level: 0.22
-    - wait_template: >-
-        {{ states.switch.living_room_amp.state == 'on' }}
 
     - service: media_player.play_media
       data_template:
diff --git a/automation/System/door_chime.yaml b/automation/System/door_chime.yaml
index 00aec0bb..4427ab76 100755
--- a/automation/System/door_chime.yaml
+++ b/automation/System/door_chime.yaml
@@ -19,8 +19,6 @@
       data:
         media_player: 'media_player.livingroomcc'
         volume_level: 0.22
-    - wait_template: >-
-        {{ states.switch.living_room_amp.state == 'on' }}
 
     - service: media_player.play_media
       data_template:
@@ -28,8 +26,7 @@
           {% if states.group.bed.state == 'off' %}
           media_player.livingroomCC
           {% else %}
-          - media_player.alarm_clock
-          - media_player.bedroom_alarm_panel
+          media_player.alarm_clock, media_player.bedroom_alarm_panel
           {% endif %}
         media_content_id: >
           {% if trigger.to_state.state == 'on' %}
diff --git a/script/speech_processing.yaml b/script/speech_processing.yaml
index cc413289..1b2a052d 100755
--- a/script/speech_processing.yaml
+++ b/script/speech_processing.yaml
@@ -64,8 +64,7 @@ speech_processing:
           {% if states.group.bed.state == 'off' %}
           media_player.livingroomCC
           {% else %}
-          - media_player.alarm_clock
-          - media_player.bedroom_alarm_panel
+          media_player.alarm_clock, media_player.bedroom_alarm_panel
           {% endif %}
         message: >-
           <speak>