diff --git a/PepperDashEssentials/Room/Types/EssentialsCombinedHuddleVtc1Room.cs b/PepperDashEssentials/Room/Types/EssentialsCombinedHuddleVtc1Room.cs
index 79f28aae..9dec21f2 100644
--- a/PepperDashEssentials/Room/Types/EssentialsCombinedHuddleVtc1Room.cs
+++ b/PepperDashEssentials/Room/Types/EssentialsCombinedHuddleVtc1Room.cs
@@ -57,11 +57,12 @@ namespace PepperDash.Essentials
             {
                 return () =>
                 {
-                    var displays = Displays.Where((d) => d is DisplayBase) as List<DisplayBase>;
+
+                    var displays = Displays.OfType<DisplayBase>().ToList();
 
                     var val = CurrentSourceInfo != null
                         && CurrentSourceInfo.Type == eSourceListItemType.Route
-                        && displays.Count() > 0;
+                        && displays.Count > 0;
                     //&& disp.PowerIsOnFeedback.BoolValue;
                     return val;
                 };
@@ -74,23 +75,7 @@ namespace PepperDash.Essentials
         {
             get
             {
-                return () =>
-                {
-                    var displays = Displays.Where((d) => d is TwoWayDisplayBase) as List<TwoWayDisplayBase>;
-                    if (displays != null)
-                    {
-                        var warmingDisplays = displays.Where((d) => d.IsWarmingUpFeedback.BoolValue);
-
-                        if (warmingDisplays.Count() > 0)
-                        {
-                            return true;
-                        }
-                        else
-                            return false;
-                    }
-                    else
-                        return false;
-                };
+                return () => Displays.OfType<TwoWayDisplayBase>().Any((d) => d.IsWarmingUpFeedback.BoolValue);
             }
         }
         /// <summary>
@@ -100,23 +85,7 @@ namespace PepperDash.Essentials
         {
             get
             {
-                return () =>
-                {
-                    var displays = Displays.Where((d) => d is TwoWayDisplayBase) as List<TwoWayDisplayBase>;
-                    if (displays != null)
-                    {
-                        var coolingDisplays = displays.Where((d) => d.IsCoolingDownFeedback.BoolValue);
-
-                        if (coolingDisplays.Count() > 0)
-                        {
-                            return true;
-                        }
-                        else
-                            return false;
-                    }
-                    else
-                        return false;
-                };
+                return () => Displays.OfType<TwoWayDisplayBase>().Any((d) => d.IsCoolingDownFeedback.BoolValue);
             }
         }
 
diff --git a/devjson commands.json b/devjson commands.json
index 62e675d1..c7ed7291 100644
--- a/devjson commands.json	
+++ b/devjson commands.json	
@@ -42,3 +42,6 @@ devjson:2 {"deviceKey":"display01Comm-com", "methodName":"SendText", "params": [
 
 devjson:10 {"deviceKey":"dmLink-ssh", "methodName":"Connect", "params": []} 
 
+devjson:2 {"deviceKey":"roomCombiner", "methodName":"SetRoomCombinationScenario", "params": ["combined"]} 
+
+devjson:2 {"deviceKey":"roomCombiner", "methodName":"SetRoomCombinationScenario", "params": ["divided"]} 
\ No newline at end of file