Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r31258f2feec374bbb0b62efe4dbb6635e151d767 -ra00cc8561b1916c257c9e9dbd6934de002ecdd25
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 31258f2feec374bbb0b62efe4dbb6635e151d767)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision a00cc8561b1916c257c9e9dbd6934de002ecdd25)
@@ -406,9 +406,6 @@
 
         balChamberTolSwitchTime = (F32)balChamberSwitchingPeriod + ( (F32)balChamberSwitchingPeriod * BAL_CHAMBER_MAX_SWITCH_TIME_TOL );
 
-        // finish the balancing chamber fill 50 ms prior completing the regular cycle time.
-        balChamberSwitchingPeriod -= 1;
-
         //Update last td dialysate flow rate
         lastTdDialysateFlowrate = tdDialysateFlowrate;
 
@@ -423,7 +420,7 @@
 
         //Testing
         balChamberValveClosePeriod = balChamberSwitchingPeriod;
-        balChamberValveClosePeriod -= 1;   // Close valves prior 50 msecond for testing
+        balChamberValveClosePeriod -= 2;   // Close valves 100 msecond prior to switching to next state
 
         currentBalChamberFillCounter      = 0;
         currentBalChamberSwitchingCounter = 0;
Index: firmware/App/Controllers/MixingControl.c
===================================================================
diff -u -r3cafed12c435f95be8ae38a8e5a5cf20ec6b706f -ra00cc8561b1916c257c9e9dbd6934de002ecdd25
--- firmware/App/Controllers/MixingControl.c	(.../MixingControl.c)	(revision 3cafed12c435f95be8ae38a8e5a5cf20ec6b706f)
+++ firmware/App/Controllers/MixingControl.c	(.../MixingControl.c)	(revision a00cc8561b1916c257c9e9dbd6934de002ecdd25)
@@ -443,12 +443,12 @@
 {
     F32 tdDialysateFlowRate = 0.0F;
     F32 balChamberSwitchingFreq = 0.0F;
-    U32 balChamberSwitchingPeriod = 0;
+    F32 balChamberSwitchingPeriod = 0;
 
     tdDialysateFlowRate = getTDDialysateFlowrate();
 
     balChamberSwitchingFreq = tdDialysateFlowRate / 30.0;
-    balChamberSwitchingPeriod = ( SEC_PER_MIN ) / (U32)balChamberSwitchingFreq;
+    balChamberSwitchingPeriod = (F32)( SEC_PER_MIN ) / balChamberSwitchingFreq;
 
     // For bicarb control period, we are using 3 cycles of balancing chamber switching period (for ex: At Qd = 600, switching period = 3sec, so acid control interval = 3*3 = 9sec
     // For acid control period, we are using 5 cycles of balancing chamber switching period (for ex: At Qd = 600, switching period = 3sec, so bicarb control interval = 3*5 = 15sec