diff --git a/Essentials DM/Essentials_DM/Chassis/HdMdNxM4kEController.cs b/Essentials DM/Essentials_DM/Chassis/HdMdNxM4kEController.cs
index 9f776551..26902061 100644
--- a/Essentials DM/Essentials_DM/Chassis/HdMdNxM4kEController.cs	
+++ b/Essentials DM/Essentials_DM/Chassis/HdMdNxM4kEController.cs	
@@ -83,7 +83,10 @@ namespace PepperDash.Essentials.DM.Chassis
 
 		public void ExecuteSwitch(object inputSelector, object outputSelector, eRoutingSignalType signalType)
 		{
-			Chassis.HdmiOutputs[1].VideoOut = Chassis.HdmiInputs[(uint)inputSelector];
+			// Try to make switch only when necessary.  The unit appears to toggle when already selected.
+			var current = Chassis.HdmiOutputs[1].VideoOut;
+			if(current != Chassis.HdmiInputs[(uint)inputSelector])
+				Chassis.HdmiOutputs[1].VideoOut = Chassis.HdmiInputs[(uint)inputSelector];
 		}
 
 		#endregion
diff --git a/Essentials/PepperDashEssentials/Properties/AssemblyInfo.cs b/Essentials/PepperDashEssentials/Properties/AssemblyInfo.cs
index 2746b056..38fcfabf 100644
--- a/Essentials/PepperDashEssentials/Properties/AssemblyInfo.cs
+++ b/Essentials/PepperDashEssentials/Properties/AssemblyInfo.cs
@@ -4,5 +4,5 @@
 [assembly: AssemblyCompany("PepperDash Technology Corp")]
 [assembly: AssemblyProduct("PepperDashEssentials")]
 [assembly: AssemblyCopyright("Copyright © PepperDash Technology Corp 2017")]
-[assembly: AssemblyVersion("1.0.42.*")]
+[assembly: AssemblyVersion("1.0.44.*")]
 
diff --git a/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs b/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
index ab34b67d..1accd526 100644
--- a/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
+++ b/Essentials/PepperDashEssentials/UIDrivers/EssentialsHuddleVTC/EssentialsHuddleVtc1PanelAvFunctionsDriver.cs
@@ -658,6 +658,7 @@ namespace PepperDash.Essentials
                     CurrentSourcePageManager.Show();
             }
             CurrentMode = UiDisplayMode.Presentation;
+			SetupSourceList();
             SetActivityFooterFeedbacks();
         }
 
@@ -986,6 +987,7 @@ namespace PepperDash.Essentials
 		/// </summary>
 		void SetupSourceList()
 		{
+				
 			var inCall = CurrentRoom.InCallFeedback.BoolValue;
 			var config = ConfigReader.ConfigObject.SourceLists;
 			if (config.ContainsKey(_CurrentRoom.SourceListKey))
@@ -997,11 +999,14 @@ namespace PepperDash.Essentials
 				foreach (var kvp in srcList)
 				{
 					var srcConfig = kvp.Value;
+					Debug.Console(1, "**** {0}, {1}, {2}, {3}, {4}", srcConfig.PreferredName, srcConfig.IncludeInSourceList,
+						srcConfig.DisableCodecSharing, inCall, this.CurrentMode);
 					// Skip sources marked as not included, and filter list of non-sharable sources when in call
 					// or on share screen
  					if (!srcConfig.IncludeInSourceList || (inCall && srcConfig.DisableCodecSharing) 
 						|| this.CurrentMode == UiDisplayMode.Call && srcConfig.DisableCodecSharing) 
 					{
+						Debug.Console(1, "Skipping {0}", srcConfig.PreferredName);
 						continue;
 					}
 
diff --git a/Release Package/PepperDashEssentials.cpz b/Release Package/PepperDashEssentials.cpz
index a72c19f3..fe9a98cb 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 ba982ce5..b674fc3f 100644
Binary files a/Release Package/PepperDashEssentials.dll and b/Release Package/PepperDashEssentials.dll differ