diff --git a/Config/Data.cs b/Config/Data.cs
index 49c90380e..2015ff4bb 100644
--- a/Config/Data.cs
+++ b/Config/Data.cs
@@ -35,7 +35,7 @@ namespace Config
 #elif DEWA_300 || ROMA_200
         public const int WMsCount = 10;
         public const int LineSize = 10;
-        public const int CompoundWMsCount = 3;
+        public const int CompoundWMsCount = 1;
         public const int HeatMetersCount = 0;
         public const int MaxPartNr = WMsCount / LineSize;
 #elif DUBAJ_50
diff --git a/TBF/BenchControl/Elde/ControlBoardDev.cs b/TBF/BenchControl/Elde/ControlBoardDev.cs
index b97e1903b..66828d343 100644
--- a/TBF/BenchControl/Elde/ControlBoardDev.cs
+++ b/TBF/BenchControl/Elde/ControlBoardDev.cs
@@ -115,19 +115,20 @@ namespace TBF.BenchControl.Elde
 		public byte[] MeretRS485Address = new byte[4];
         public float[] EtCalib = new float[6] { 1, 1, 1, 1, 1, 1 };
 #elif PUCHONG_200 || GENESIS || BERLIN || PETERSBURG_200 || RUM_MOB
-        public uint[,] RegValveCalib = new uint[16, 2] { {100,500}, {100,500}, {100,500}, {100,500},
-														 {100,500}, {100,500}, {100,500}, {100,500}, 
-														 {100,500}, {100,500}, {100,500}, {100,500}, 
-														 {100,500}, {100,500}, {100,500}, {100,500} };
+        public uint[,] RegValveCalib = new uint[16, 2] { {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, 
+														 {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500} };
         public byte[] MeretRS485Address = new byte[4];
         public float[] EtCalib = new float[7] { 1, 1, 1, 1, 1, 1, 1 };
-#elif DEWA_300 || ROMA_200
-        public uint[,] RegValveCalib = new uint[16, 2] { {100,500}, {100,500}, {100,500}, {100,500},
-														 {100,500}, {100,500}, {100,500}, {100,500}, 
-														 {100,500}, {100,500}, {100,500}, {100,500}, 
-														 {100,500}, {100,500}, {100,500}, {100,500} };
+#elif DEWA_300
+        public uint[,] RegValveCalib = new uint[16, 2] { {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, 
+														 {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500} };
         public byte[] MeretRS485Address = new byte[4];
         public float[] EtCalib = new float[8] { 1, 1, 1, 1, 1, 1, 1, 1 };
+#elif ROMA_200
+        public uint[,] RegValveCalib = new uint[16, 2] { {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, 
+														 {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500}, {100,500} };
+        public byte[] MeretRS485Address = new byte[5];
+        public float[] EtCalib = new float[8] { 1, 1, 1, 1, 1, 1, 1, 1 };
 #elif MUNICH || TORINO_50 || BADGER_MALA_TRAT || BADGER_STREDNA_TRAT || TORUN_50 || CEVAK_40 || TURA_IPERL || TURA_IPERL_NEW || TURA_SPECIAL || MURES_40 || FUZHOU_50 || SLM_50 || PETERSBURG_50 || KEMPNO_50 || BAHRAIN_50 || KRAKOW_50 || JUZNA_AFRIKA_50 || IZRAEL_25 || ZAMBIA || ZODINO || FEWA_50 || FILIPINY_50 || FUZHOU_100
         public uint[,] RegValveCalib = new uint[8,2] {{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500},{100,500}};
 		public byte[] MeretRS485Address = new byte[4];
diff --git a/TBF/BenchControl/StateMachine.cs b/TBF/BenchControl/StateMachine.cs
index 93fe1c472..648645f6e 100644
--- a/TBF/BenchControl/StateMachine.cs
+++ b/TBF/BenchControl/StateMachine.cs
@@ -258,9 +258,9 @@ namespace TBF.BenchControl
 					IScaleOrTank tank = cmpnt as IScaleOrTank;
                     tanks.Add(tank);
 
-					if      (tank.ScaleNr == 0) Tank1 = tank;
-					else if (tank.ScaleNr == 1) Tank2 = tank;
-					else if (tank.ScaleNr == 2) Tank3 = tank;
+					if      ((tank.ScaleNr == 0) && (Tank1 == null)) Tank1 = tank;
+					else if ((tank.ScaleNr == 1) && (Tank2 == null)) Tank2 = tank;
+					else if ((tank.ScaleNr == 2) && (Tank3 == null)) Tank3 = tank;
                 }
 
                 Elde.Valve.Valve eldeValve = (cmpnt as Elde.Valve.Valve);
@@ -335,19 +335,19 @@ namespace TBF.BenchControl
 				{
 					IScaleOrTank tank = cmpnt as IScaleOrTank;
 
-					if (tank.ScaleNr == 0)
+                    if ((tank.ScaleNr == 0) && (DrainValve1 == null))
 					{
 						DrainValve1 = tank.DrainValve;
 						log.WarnFormat("InitializeBoardEtc() ... Scale1={0} Draining valve1={1}",
 										tank.Name, (DrainValve1 != null) ? DrainValve1.Name : "---");
 					}
-					else if (tank.ScaleNr == 1)
+					else if ((tank.ScaleNr == 1) && (DrainValve2 == null))
 					{
 						DrainValve2 = tank.DrainValve;
 						log.WarnFormat("InitializeBoardEtc() ... Scale2={0} Draining valve2={1}",
 										tank.Name, (DrainValve2 != null) ? DrainValve2.Name : "---");
 					}
-					else if (tank.ScaleNr == 2)
+                    else if ((tank.ScaleNr == 2) && (DrainValve3 == null))
 					{
 						DrainValve3 = tank.DrainValve;
 						log.WarnFormat("InitializeBoardEtc() ... Scale3={0} Draining valve3={1}",
diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index 67fd21c8b..b151a4e6f 100644
--- a/TBF/Properties/AssemblyInfo.cs
+++ b/TBF/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("2.24.1359.0")]
-[assembly: AssemblyFileVersion("2.24.1359.0")]
+[assembly: AssemblyVersion("2.24.1363.0")]
+[assembly: AssemblyFileVersion("2.24.1363.0")]
diff --git a/packages/ControlBoard/Roma200/ControlComponent3U.dll b/packages/ControlBoard/Roma200/ControlComponent3U.dll
index 7ca7e035d..018ef812e 100644
Binary files a/packages/ControlBoard/Roma200/ControlComponent3U.dll and b/packages/ControlBoard/Roma200/ControlComponent3U.dll differ