diff --git a/TBF/Properties/AssemblyInfo.cs b/TBF/Properties/AssemblyInfo.cs
index 37a3cfaae..cea1127a3 100644
--- a/TBF/Properties/AssemblyInfo.cs
+++ b/TBF/Properties/AssemblyInfo.cs
@@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
 //      Build Number
 //      Revision
 //
-[assembly: AssemblyVersion("3.1.1604.0")]
-[assembly: AssemblyFileVersion("3.1.1604.0")]
+[assembly: AssemblyVersion("3.1.1605.0")]
+[assembly: AssemblyFileVersion("3.1.1605.0")]
diff --git a/TBF/Rig/ControlBoard/Uni/UniCB.cs b/TBF/Rig/ControlBoard/Uni/UniCB.cs
index 2b7f3cd20..f90474da8 100644
--- a/TBF/Rig/ControlBoard/Uni/UniCB.cs
+++ b/TBF/Rig/ControlBoard/Uni/UniCB.cs
@@ -146,6 +146,7 @@ namespace TBF.Rig.ControlBoard.Uni
         /// Last test results
         public double TestTime { get { return Data.Ttime; } }
         public int RefPulses { get { return Data.EtPulses[0]; } }
+        public int MassRefPulses { get { return Data.EtPulsesK; } }
         public float ValveOpenCloseTime { set; get; }    /// Start valve open or close time in sec
 
         /// <summary>
diff --git a/TBF/Rig/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs b/TBF/Rig/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs
index dfecdbf53..459eada42 100644
--- a/TBF/Rig/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs
+++ b/TBF/Rig/TestMethods/FlyingStartMassCollProlonged/FlyingStartMassCollProlongedSeq.cs
@@ -22,8 +22,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollProlonged
         /// <returns>true when capabilities of devices are OK</returns>
         public static bool CheckDeviceCaps(Config.Entities.Test test, OutputPath devices, out string message)
         {
-            if (!(StateMachine.ControlBoard is ControlBoard.Legacy.CBoard) &&
-                !(StateMachine.ControlBoard is ControlBoard.Uni.UniCB))
+            if (!(StateMachine.ControlBoard is ControlBoard.Uni.UniCB))
             {
                 /// Control board does not support this method
                 message = string.Format("{0}: {1}", test.Name, Strings.Test_bench_does_not_suport_selected_test_method);
@@ -674,11 +673,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollProlonged
                 UpdateTempPressDensAmb(tstRslt);
 
                 double totalPulses = Convert.ToDouble(cBrd.RefPulses);
-                double massPulses = totalPulses;
-                if (StateMachine.ControlBoard is ControlBoard.Legacy.CBoard)
-                {
-                    massPulses = Convert.ToDouble((StateMachine.ControlBoard as ControlBoard.Legacy.CBoard).EtPulsesK);
-                }
+                double massPulses  = Convert.ToDouble(cBrd.MassRefPulses);
 
 				/// Main results
                 tstRslt.MethodClass     = TbfComponents.FindComponent(test.Method).ClassName;
@@ -951,7 +946,7 @@ namespace TBF.Rig.TestMethods.FlyingStartMassCollProlonged
                                 meterRslt.VolumeMeter  = meterRslt.PulsesMeter * regReader.LtrsPerPulse;	/// [l]
                                 meterRslt.VolumeRef    = meterRslt.PulsesMaster * tstRslt.ConstMaster;	    /// [l], tstRslt.ConstMaster is calculated from massPulses and VolumeCTV (from scale)
 
-                                log.DebugFormat("Datastream:  RefPls4mtrRR={0} Tmtr={1} Ttime={2} Vmtr={3} Vref={4}",
+                                log.DebugFormat("Pulses:  RefPls4mtrRR={0} Tmtr={1} Ttime={2} Vmtr={3} Vref={4}",
                                                  meterRslt.PulsesMaster,
                                                  meterRslt.TestTime,
                                                  tstRslt.TestTime,