Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -rcceb0bf86fc6ddb1131701844960f59d968988c5 -rcb32846b50cb04e0a68133048325fe81bdc2a3cc
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision cceb0bf86fc6ddb1131701844960f59d968988c5)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision cb32846b50cb04e0a68133048325fe81bdc2a3cc)
@@ -57,8 +57,8 @@
 /// Payload record structure for balancing chamber switch only request
 typedef struct
 {
-    U32 startStop;                                                                              ///< balancing chamber switching only start:1 and stop: 0
-    F32 flowrate;                                                                               ///< dialysate flowrate in ml/min
+    U32 startStop;                                                                              ///< Balancing chamber switching only start:1 and stop: 0
+    F32 flowrate;                                                                               ///< Dialysate flowrate in ml/min
 } BC_SWITCHING_ONLY_START_CMD_PAYLOAD_T;
 
 // ********** private data **********
@@ -548,6 +548,9 @@
     BAL_CHAMBER_EXEC_STATE_T state  = BAL_CHAMBER_STATE1_VALVES_CLOSE;
     freshDialPressure               = getFilteredPressure( D18_PRES );
     spentDialPressure               = getFilteredPressure( D51_PRES );
+    BOOL isBothFillsComplete        = FALSE;
+    BOOL isFirstCycleNotDone        = FALSE;
+    BOOL isFillCompleteOrFirstCycle = FALSE;
 
     // If fill is taking too long, set an alarm for fill timeout
     if ( ( balChamberFillTimeoutCount > 0 ) && ( currentBalChamberFillCounter > balChamberFillTimeoutCount ) )
@@ -569,7 +572,11 @@
     checkSpentFillComplete( spentDialPressure );
 
     // Check both spent and fresh side fill is complete
-    if ( ( TRUE == isSpentFillComplete ) && ( TRUE == isPressureStabilizedDuringFill ) || ( FALSE == isFirstCycleBCSwitchingCompleted ) )
+    isBothFillsComplete = ( TRUE == isSpentFillComplete ) && ( TRUE == isPressureStabilizedDuringFill );
+    isFirstCycleNotDone = ( FALSE == isFirstCycleBCSwitchingCompleted );
+    isFillCompleteOrFirstCycle = isBothFillsComplete || isFirstCycleNotDone;
+
+    if ( TRUE == isFillCompleteOrFirstCycle )
     {
         // On successful completion, learn timeout as 150% of the observed fill count (once per cycle).
         if ( balChamberFillTimeoutCount == 0U )
@@ -720,10 +727,12 @@
 static BAL_CHAMBER_EXEC_STATE_T handleBalChamberState2ValvesClose( void )
 {
     BAL_CHAMBER_EXEC_STATE_T state  = BAL_CHAMBER_STATE2_VALVES_CLOSE;
+    freshDialPressure               = getFilteredPressure( D18_PRES );
+    spentDialPressure               = getFilteredPressure( D51_PRES );
+    BOOL isBothFillsComplete        = FALSE;
+    BOOL isFirstCycleNotDone        = FALSE;
+    BOOL isFillCompleteOrFirstCycle = FALSE;
 
-    freshDialPressure = getFilteredPressure( D18_PRES );
-    spentDialPressure = getFilteredPressure( D51_PRES );
-
     // Check fresh dialysate pressure back in range to indicate fill complete.
     if ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG ) )
     {
@@ -744,7 +753,11 @@
     checkSpentFillComplete( spentDialPressure );
 
     // Check switching cycle time or pressure check for valve closure
-    if ( ( TRUE == isSpentFillComplete ) && ( TRUE == isPressureStabilizedDuringFill ) || ( FALSE == isFirstCycleBCSwitchingCompleted ) )
+    isBothFillsComplete = ( TRUE == isSpentFillComplete ) && ( TRUE == isPressureStabilizedDuringFill );
+    isFirstCycleNotDone = ( FALSE == isFirstCycleBCSwitchingCompleted );
+    isFillCompleteOrFirstCycle = isBothFillsComplete || isFirstCycleNotDone;
+
+    if ( TRUE == isFillCompleteOrFirstCycle )
     {
         // On successful completion, learn timeout as 150% of the observed fill count (once per cycle).
         if ( balChamberFillTimeoutCount == 0U )
@@ -887,7 +900,7 @@
         adjustedSpeed              = ( ( (F32)absDiffSpentFillCount / (F32)balChamberValveClosePeriod ) * spentDialPumpSpeed ) * D48_SPEED_ADJUST_FACTOR;
 
         result = ( ( diffSpentFillCompleteCount <= 0 ) && ( diffSpentFillCompleteCount >= -2 ) ) ? TRUE : FALSE;
-        //Not adjust the D48 pump speed if the fill counter is just 50ms difference from the closing period(considering only positive DEADBAND as negative deadband might indicate under fill of BC).
+        //Not adjust the D48 pump speed if the fill counter is just 50ms difference from the closing period (considering only positive DEADBAND as negative deadband might indicate under fill of BC).
         if ( 0 == result )
         {
             if ( diffSpentFillCompleteCount < SPENT_DIFF_COUNT_ZERO )