diff --git a/automation/Speech/announcements.yaml b/automation/Speech/announcements.yaml
index 2b2f8fd6..dc91a1b7 100755
--- a/automation/Speech/announcements.yaml
+++ b/automation/Speech/announcements.yaml
@@ -1,4 +1,4 @@
-######################################################################
+##########  ############################################################
 ##  Announce when people come or go.
 ## Announce over all Chromecast Audios 
 ######################################################################
@@ -20,13 +20,20 @@
     - service: script.Voice_notify
       data_template:
         value1: >
+          
+          {% set person = trigger.entity_id.split('.')[1]|replace('_', ' ')%}
+          
+          {% macro greeting_sentence(person) %}
           {{ [
-          "Welcome home  {%trigger.entity_id.split('.')[1]|replace('_', ' ')%}",
-          "Guess who is home?  {{ trigger.entity_id.split('.')[1]|replace('_', ' ')}} is!",
-          "Attention:  {{trigger.entity_id.split('.')[1]|replace('_', ' ')}} is now in the house.",
-          "{{ trigger.entity_id.split('.')[1]|replace('_', ' ')}} in da house!",
-          "Welcome Home {{ trigger.entity_id.split('.')[1]|replace('_', ' ')}}.  We've missed you. or at least Molly did.",
-          "Our home is now complete, Rest your head and relax your feet! Welcome Back {{ trigger.entity_id.split('.')[1]|replace('_', ' ')}}",
-          "Life is like a song, you’re back where you belong. Welcome home {{ trigger.entity_id.split('.')[1]|replace('_', ' ')}}"
-          ] | random }}      
-    
\ No newline at end of file
+          "Welcome home " ~ person,
+          "Guess who is home? "  ~ person +" is!",
+          "Attention: " ~ person + " is now in the house.",
+          person ~ " in da house!",
+          "Welcome Home " ~ person + ".  We've missed you. or at least Molly did.",
+          "Our home is now complete, Rest your head and relax your feet! Welcome Back " ~ person,
+          "Life is like a song, you’re back where you belong. Welcome home" ~ person,
+          "Hey there " ~ person,
+          person ~ "! You're home!"
+          ] | random }}    
+          {% endmacro %}
+          {{greeting_sentence(person)}}
\ No newline at end of file