diff --git a/config/configuration.yaml b/config/configuration.yaml
index 5579c9e0..6fdefae3 100755
--- a/config/configuration.yaml
+++ b/config/configuration.yaml
@@ -233,14 +233,14 @@ climate:
   #   name: Living Room TV
   #   scan_interval: 180
 
-# tts:
-#   - platform: amazon_polly
-#     aws_access_key_id: !secret aws_access_key_ID
-#     aws_secret_access_key: !secret aws_secret_access_key
-#     region_name: 'us-east-1'
-#     text_type: ssml
-#     cache: True
-#    cache_dir: /data/tts
+tts:
+  - platform: amazon_polly
+    aws_access_key_id: !secret aws_access_key_ID
+    aws_secret_access_key: !secret aws_secret_access_key
+    region_name: 'us-east-1'
+    text_type: ssml
+    cache: True
+   # cache_dir: /data/tts
 
 wink:
   # email: !secret wink_username
diff --git a/config/logger.yaml b/config/logger.yaml
index 1018ed25..9a3dc5fc 100755
--- a/config/logger.yaml
+++ b/config/logger.yaml
@@ -11,6 +11,7 @@ logs:
   aiohttp.access: critical
   aiohttp.server: critical
   custom_components.media_player.floorplan_speaker: error
+  custom_components.media_player.living_room: info
   homeassistant.core: error
   homeassistant.components.automation: warn
   homeassistant.components.binary_sensor: error
@@ -19,7 +20,7 @@ logs:
   homeassistant.components.discovery: warn
   homeassistant.components.feedreader: warn
   homeassistant.components.http: warn
-  homeassistant.components.media_player: warn
+  homeassistant.components.media_player: info
   homeassistant.components.sensor.pi_hole: critical
   homeassistant.components.sensor.rest: critical
   homeassistant.components.recorder: error
diff --git a/config/packages/alexa_tts.yaml b/config/packages/alexa_tts.yaml
index 2d8e823b..4c4b7e18 100755
--- a/config/packages/alexa_tts.yaml
+++ b/config/packages/alexa_tts.yaml
@@ -29,7 +29,7 @@ media_player:
 group:
 #
   all_echoes:
-    view: yes
+    view: no
     control: hidden
     name: 'Alexa'
     entities:
diff --git a/config/script/speech_engine.yaml b/config/script/speech_engine.yaml
index c3982735..c97778ee 100755
--- a/config/script/speech_engine.yaml
+++ b/config/script/speech_engine.yaml
@@ -31,9 +31,8 @@ speech_engine:
         media_player: >-
             {% if media_player | length == 0 %}
               {% set media_player = [
-                'media_player.living_room',
-                'media_player.bedroom_alarm_panel',
-                'media_player.office'
+                'media_player.livingroomcc',
+                'media_player.bedroom_alarm_panel'
               ] %}
             {% endif %}
 
diff --git a/config/script/speech_processing.yaml b/config/script/speech_processing.yaml
index 36d1a555..1b2a052d 100755
--- a/config/script/speech_processing.yaml
+++ b/config/script/speech_processing.yaml
@@ -58,19 +58,19 @@ speech_processing:
             0.3
           {% endif %}
 
-    - service: media_player.alexa_tts
+    - service: tts.amazon_polly_say
       data_template:
         entity_id: >
           {% if states.group.bed.state == 'off' %}
-          media_player.living_room
+          media_player.livingroomCC
           {% else %}
           media_player.alarm_clock, media_player.bedroom_alarm_panel
           {% endif %}
         message: >-
-          # <speak>
+          <speak>
             {{ speech_message }}
-          # </speak>
-        # cache: true
+          </speak>
+        cache: true
 
     - service: input_boolean.turn_off
       data: