diff --git a/config/automation/System/CucKoo_Clock.yaml b/config/automation/System/CucKoo_Clock.yaml
index 14289497..df2b72e9 100755
--- a/config/automation/System/CucKoo_Clock.yaml
+++ b/config/automation/System/CucKoo_Clock.yaml
@@ -1,10 +1,12 @@
-###################################
-##  cuckoo Clock simulation.
+#####################################################################
+# @CCOSTAN
+# Original Repo : https://github.com/CCOSTAN/Home-AssistantConfig
 ## Plays the number of cuckoos per hour and 1 on the half hour.
-###################################
+#####################################################################
 
 - alias: Cuckoo Clock
   id: 33dcd8e2-e87c-4d18-82bc-c7f9b53a1624
+  mode: restart
   trigger:
     - platform: time_pattern
       hours: '*'
@@ -16,16 +18,14 @@
     - condition: time
       after: '09:29:00'
       before: '21:30:00'
-    - condition: state
-      entity_id: group.family
-      state: 'home'
-    - condition: template
-      value_template: >
-        {% if is_state('media_player.livingroomCC', 'playing') %}
-          false
-        {% else %}
-          true
-        {% endif %}
+    - condition: or  #Either we are home or Guest_Mode is on.
+      conditions:
+        - condition: state
+          entity_id: group.family
+          state: 'home'
+        - condition: state
+          entity_id: input_boolean.guest_mode
+          state: 'on'
 
   action:
     - service: script.amp_settings
@@ -33,6 +33,8 @@
         media_player: 'media_player.livingroomcc'
         volume_level: 0.22
 
+    - wait_template: "{{ not is_state('media_player.livingroomCC', 'playing') }}"
+
     - service: media_player.play_media
       data_template:
         entity_id: >
diff --git a/config/www/custom_ui/floorplan/images/branding/att_speedtest.png b/config/www/custom_ui/floorplan/images/branding/att_speedtest.png
index 186afe25..97d7d62e 100644
Binary files a/config/www/custom_ui/floorplan/images/branding/att_speedtest.png and b/config/www/custom_ui/floorplan/images/branding/att_speedtest.png differ