diff --git a/Essentials Devices Common/Essentials Devices Common/Display/AvocorVTFDisplay.cs b/Essentials Devices Common/Essentials Devices Common/Display/AvocorVTFDisplay.cs
index 992263bf..51790d7f 100644
--- a/Essentials Devices Common/Essentials Devices Common/Display/AvocorVTFDisplay.cs	
+++ b/Essentials Devices Common/Essentials Devices Common/Display/AvocorVTFDisplay.cs	
@@ -67,9 +67,9 @@ namespace PepperDash.Essentials.Devices.Displays
 		bool _IsCoolingDown;
 		ushort _VolumeLevelForSig;
         int _LastVolumeSent;
+        ushort _PreMuteVolumeLevel;
 		bool _IsMuted;
         RoutingInputPort _CurrentInputPort;
-        //byte[] IncomingBuffer = new byte[]{};
         ActionIncrementer VolumeIncrementer;
         bool VolumeIsRamping;
         public bool IsInStandby { get; private set; }
@@ -358,6 +358,14 @@ namespace PepperDash.Essentials.Devices.Displays
                 {
                     _VolumeLevelForSig = newVol;
                     VolumeLevelFeedback.FireUpdate();
+
+                    if (_VolumeLevelForSig > 0)
+                        _IsMuted = false;
+                    else
+                        _IsMuted = true;
+
+                    MuteFeedback.FireUpdate();
+
                     Debug.Console(1, this, "Volume Level: {0}", VolumeLevelFeedback.IntValue);
                 }
             }
@@ -635,7 +643,7 @@ namespace PepperDash.Essentials.Devices.Displays
         /// </summary>
 		public void MuteOff()
 		{
-            SendBytes(new byte[] { 0xAA, 0x13, 0x00, 0x01, 0x00, 0x00 });
+            SetVolume(_PreMuteVolumeLevel);
         }
 
         /// <summary>
@@ -643,16 +651,18 @@ namespace PepperDash.Essentials.Devices.Displays
         /// </summary>
 		public void MuteOn()
 		{
-            SendBytes(new byte[] { 0xAA, 0x13, 0x00, 0x01, 0x01, 0x00 });
+            _PreMuteVolumeLevel = _VolumeLevelForSig;
+
+            SetVolume(0);
 		}
 
-        /// <summary>
-        /// 
-        /// </summary>
-        public void MuteGet()
-        {
-            SendBytes(new byte[] { 0xAA, 0x13, 0x00, 0x00, 0x00 });
-        }
+        ///// <summary>
+        ///// 
+        ///// </summary>
+        //public void MuteGet()
+        //{
+        //    SendBytes(new byte[] { 0x07, ID, 0x01, });
+        //}
 
 		#endregion
 
diff --git a/Essentials/PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs b/Essentials/PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs
index cbadd7e0..7e5303cb 100644
--- a/Essentials/PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs
+++ b/Essentials/PepperDashEssentials/Room/Types/EssentialsHuddleSpaceRoom.cs
@@ -202,6 +202,12 @@ namespace PepperDash.Essentials
         /// </summary>
         protected override void EndShutdown()
         {
+            SetDefaultLevels();
+
+            RunDefaultRoute();
+
+            CrestronEnvironment.Sleep(200);
+
             RunRouteAction("roomOff");
         }
 
diff --git a/Essentials/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs b/Essentials/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs
index 54a1ee76..eb33edc7 100644
--- a/Essentials/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs
+++ b/Essentials/PepperDashEssentials/Room/Types/EssentialsHuddleVtc1Room.cs
@@ -265,6 +265,13 @@ namespace PepperDash.Essentials
         protected override void EndShutdown()
         {
             VideoCodec.EndAllCalls();
+
+            SetDefaultLevels();
+
+            RunDefaultPresentRoute();
+
+            CrestronEnvironment.Sleep(200);
+
             RunRouteAction("roomOff");
         }
 
diff --git a/Release Package/PepperDashEssentials.cpz b/Release Package/PepperDashEssentials.cpz
index ce3897e2..914d6224 100644
Binary files a/Release Package/PepperDashEssentials.cpz and b/Release Package/PepperDashEssentials.cpz differ
diff --git a/Release Package/PepperDashEssentials.dll b/Release Package/PepperDashEssentials.dll
index 0987adf0..341615c7 100644
Binary files a/Release Package/PepperDashEssentials.dll and b/Release Package/PepperDashEssentials.dll differ