diff --git a/automation/tts_repeat.yaml b/automation/tts_repeat.yaml
index 8517b8c9..b02993bc 100755
--- a/automation/tts_repeat.yaml
+++ b/automation/tts_repeat.yaml
@@ -5,11 +5,11 @@
   
   trigger:
     - platform: state
-      entity_id: input_boolean.repeat_message
+      entity_id: input_boolean.last_message
       state: 'on'
       from: 'off'
       
   action:
     - service: script.Voice_notify
       data_template:
-        value1: "{{states.sensor.polly_lastmsg.state}}"
\ No newline at end of file
+        value1: "{{states('sensor.polly_lastmsg')}}"
\ No newline at end of file
diff --git a/customize/input_booleans.yaml b/customize/input_booleans.yaml
index 520c7588..79514d44 100755
--- a/customize/input_booleans.yaml
+++ b/customize/input_booleans.yaml
@@ -16,6 +16,13 @@ input_boolean.guest_mode:
   icon: mdi:account-alert
   
  
+input_boolean.last_message:
+  friendly_name: 'Repeat Last Notification'
+  emulated_hue: True
+  hidden: False
+  icon: mdi:repeat-once
+  
+ 
 input_boolean.school_mode:
   friendly_name: 'School Mode'
   emulated_hue: True
diff --git a/group/home_mode.yaml b/group/home_mode.yaml
index 8b2c7767..191862cb 100755
--- a/group/home_mode.yaml
+++ b/group/home_mode.yaml
@@ -5,4 +5,4 @@ home_modes:
     - input_boolean.school_mode
     - input_boolean.alert_mode
     - input_boolean.speech_notifications
-#    - input_boolean.trash_reminder
+    - input_boolean.last_message
diff --git a/input_boolean/home_modes.yaml b/input_boolean/home_modes.yaml
index 3f6b7722..d87355ea 100755
--- a/input_boolean/home_modes.yaml
+++ b/input_boolean/home_modes.yaml
@@ -18,7 +18,7 @@ speech_notifications:
   icon: mdi:speaker-wireless
   initial: on 
 
-repeat_message:
-  name: Repeat Last Notification
+last_message:
+  name: Last Notification
   icon: mdi:repeat-once
   initial: off
\ No newline at end of file
diff --git a/script/voice_notify.yaml b/script/voice_notify.yaml
index 79716830..27ccd61f 100755
--- a/script/voice_notify.yaml
+++ b/script/voice_notify.yaml
@@ -80,5 +80,5 @@ voice_notify:
         cache: true
  
     - service: input_boolean.turn_off
-      entity_id: input_boolean.repeat_message
+      entity_id: input_boolean.last_message