diff --git a/config/packages/jarvis.yaml b/config/packages/jarvis.yaml
index 9b37c42..3feb58d 100755
--- a/config/packages/jarvis.yaml
+++ b/config/packages/jarvis.yaml
@@ -9,124 +9,72 @@ input_boolean:
   house_party_protocol_switch:
     name: House Party Switch
 
-automation:
-  - id: house_party_protocol_on
-    alias: Turn On House Party Protocol
-    initial_state: true
-    trigger:
-    - platform: state
-      entity_id: input_boolean.house_party_protocol_switch
-      to: 'on'
-    action:
-    - service: homeassistant.turn_on
-      entity_id: group.incense
-    - delay: 00:00:05
-    - service: script.status_annc
-      data_template:
-        who: '{{ states.sensor.room_presence.state }}'
-        call_house_party_protocol_enabled: 1
+# automation:
+#   - id: house_party_protocol_on
+#     alias: Turn On House Party Protocol
+#     initial_state: true
+#     trigger:
+#     - platform: state
+#       entity_id: input_boolean.house_party_protocol_switch
+#       to: 'on'
+#     action:
+#     - delay: 00:00:05
+#     - service: homeassistant.turn_on
+#       entity_id: group.incense
+#     - service: script.status_annc
+#       data_template:
+#         who: '{{ states.sensor.room_presence.state }}'
+#         call_house_party_protocol_enabled: 1
   
-  - id: house_party_protocol_off
-    alias: Turn Off House Party Protocol
-    initial_state: true
-    trigger:
-    - platform: state
-      entity_id: input_boolean.house_party_protocol_switch
-      to: 'off'
-    action:
-    - service: homeassistant.turn_off
-      entity_id: group.incense
-    - delay: 00:00:05
-    - service: script.status_annc
-      data_template:
-        who: '{{ states.sensor.room_presence.state }}'
-        call_house_party_protocol_disabled: 1
+#   - id: house_party_protocol_off
+#     alias: Turn Off House Party Protocol
+#     initial_state: true
+#     trigger:
+#     - platform: state
+#       entity_id: input_boolean.house_party_protocol_switch
+#       to: 'off'
+#     action:
+#     - delay: 00:00:05
+#     - service: homeassistant.turn_off
+#       entity_id: group.incense
+#     - service: script.status_annc
+#       data_template:
+#         who: '{{ states.sensor.room_presence.state }}'
+#         call_house_party_protocol_disabled: 1
             
 script:
-  
-  # To Use:
-  # service: script.amp_voice
-  # Data
-  #  who: media_player_ha_speaker
-  #   #who:  “{{ states(‘sensor.room_presence’) }}” 
-  #   message: something to say
-  #
-  amp_voice:
+  house_party_protocol_on:
     sequence:
-    - service: media_player.turn_on
-      data_template:
-        entity_id: >
-          {{ who }} 
-    - service: script.dim_main_volume
-    - service: media_player.volume_set
-      data_template:
-        entity_id: >
-          {{ who }}
-        volume_level: >
-            {% if is_state('input_boolean.audible_notifications.state','on') %}
-              .6
-            {% else %}
-              .4
-            {% endif %}
-    - service: >
-        {{ who }}
-      data: 
-          message: >
-            {{ message }}
-          data:
-            type: tts
-    - delay: 00:00:20
-    - service: script.raise_main_volume
-  
+      - delay: 00:00:05
+      - service: homeassistant.turn_on
+        entity_id: group.incense
+      - service: script.status_annc
+        data_template:
+          who: '{{ states.sensor.room_presence.state }}'
+          call_house_party_protocol_enabled: 1
 
-
-  # To Use:
-  # service: script.polly_voice
-  # Data
-  #  who: media_player_ha_speaker
-  #   #who:  “{{ states(‘sensor.room_presence’) }}” 
-  #   message: something to say
-  #
-  polly_voice:
+  house_party_protocol_off:
     sequence:
-    - service: media_player.turn_on
-      data_template:
-        entity_id: >
-          {{ who }}
-    - service: media_player.volume_set
-      data_template:
-        entity_id: >
-          {{ who }}
-        volume_level: >
-            {% if states.input_boolean.audible_notifications.state == 'on' %}
-              .7
-            {% else %}
-              .4
-            {% endif %}
-    - service: tts.amazon_polly_say
-      data_template:
-        entity_id: >
-          {{ who }}
-        message: >-
-          <speak>
-          <break time="1s"/>
-          {{ message }}
-          </speak>
-        cache: true
-  
+      - delay: 00:00:05
+      - service: homeassistant.turn_off
+        entity_id: group.incense
+      - service: script.status_annc
+        data_template:
+          who: '{{ states.sensor.room_presence.state }}'
+          call_house_party_protocol_disabled: 1
 
   alexa_interjection:
     sequence:
       - service: script.status_annc
         data:
-          who: '{{ states.sensor.alexa_audio.state}}'
-          call_interuption: 1
+          who: "{{ states('sensor.last_alexa')}}"
+          call_confirmation: 1
 
   google_interjection:
     sequence:
       - service: script.status_annc
         data:
           who: '{{ states.sensor.room_audio.state }}'
-          call_interuption: 1
+          call_confirmation: 1