Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -rb0da135bc589efaf8ad6f3c8c1988dcb672f3ca0 -r7d7129ebe8a98694bea7cf4118f3bedf62f2157b
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision b0da135bc589efaf8ad6f3c8c1988dcb672f3ca0)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 7d7129ebe8a98694bea7cf4118f3bedf62f2157b)
@@ -106,7 +106,7 @@
 static BOOL isBalChamberSwitchingOffRequested;                                                  ///< Flag indicating that a request was made to deactivate balancing chamber switching.
 
 //TODO: remove later once level sensor working
-static U32 bicarbChamberPeriodicFillCounter;  
+static U32 bicarbChamberPeriodicFillCounter;
 
 // ********** private function prototypes **********
 
@@ -557,7 +557,7 @@
     freshDialPressure         = getFilteredPressure( D18_PRES );
     spentDialPressure         = getFilteredPressure( D51_PRES );
 
-    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
+    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) )
     {
         //Set Trimmer heater Target temp every BC cycle to catch up fresh dialysate temp
         setHeaterTargetTemperature( D45_HEAT, getFilteredTemperatureValue( D4_TEMP ) );
@@ -704,20 +704,22 @@
 
     // Check both spent and fresh side fill is complete
     isBothFillsComplete = ( TRUE == isSpentFillComplete ) && ( TRUE == isPressureStabilizedDuringFill );
-    isFirstCycleNotDone = ( FALSE == isFirstCycleBCSwitchingCompleted );
+    isFirstCycleNotDone = ( ( FALSE == isFirstCycleBCSwitchingCompleted ) && ( currentBalChamberSwitchingCounter >= balChamberValveClosePeriod ) && ( TRUE == getBalChamberSwitchingOnlyStatus() ) );
 
     if ( FALSE == getBalChamberSwitchingOnlyStatus() )
     {
         isFillCompleteOrFirstCycle = isBothFillsComplete || isFirstCycleNotDone;
     }
 
-    if ( ( TRUE == isFillCompleteOrFirstCycle ) ||
-       ( ( currentBalChamberSwitchingCounter >= balChamberValveClosePeriod ) && ( TRUE == getBalChamberSwitchingOnlyStatus() ) ) )
+    if ( TRUE == isFillCompleteOrFirstCycle )
     {
         // close the state 1 opened valves
         valveControlForBCState1FillEnd();
         isBalChamberFillInProgress = FALSE;
-        setDialysatePumpTargetRPM( D48_PUMP, getD48PumpSpeedForBCFill(), TRUE );
+        if ( FALSE == getBalChamberSwitchingOnlyStatus() )
+        {
+            setDialysatePumpTargetRPM( D48_PUMP, getD48PumpSpeedForBCFill(), TRUE );
+        }
 
         // Transition to next state
         state = BAL_CHAMBER_STATE1_FILL_END;
@@ -859,10 +861,11 @@
         acidVolume        = getF32OverrideValue( &acidDoseVolume );
         bicarbVolume      = getF32OverrideValue( &bicarbDoseVolume );
     }
+
     freshDialPressure         = getFilteredPressure( D18_PRES );
     spentDialPressure         = getFilteredPressure( D51_PRES );
 
-    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
+    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) )
     {
         //Set Trimmer heater Target temp every BC cycle to catch up fresh dialysate temp
         setHeaterTargetTemperature( D45_HEAT, getFilteredTemperatureValue( D4_TEMP ) );
@@ -952,20 +955,22 @@
 
     // Check switching cycle time or pressure check for valve closure
     isBothFillsComplete = ( TRUE == isSpentFillComplete ) && ( TRUE == isPressureStabilizedDuringFill );
-    isFirstCycleNotDone = ( FALSE == isFirstCycleBCSwitchingCompleted );
+    isFirstCycleNotDone = ( ( FALSE == isFirstCycleBCSwitchingCompleted ) && ( currentBalChamberSwitchingCounter >= balChamberValveClosePeriod ) && ( TRUE == getBalChamberSwitchingOnlyStatus() ) );
 
     if ( FALSE == getBalChamberSwitchingOnlyStatus() )
     {
         isFillCompleteOrFirstCycle = isBothFillsComplete || isFirstCycleNotDone;
     }
 
-    if ( ( TRUE == isFillCompleteOrFirstCycle ) ||
-       ( ( currentBalChamberSwitchingCounter >= balChamberValveClosePeriod ) && ( TRUE == getBalChamberSwitchingOnlyStatus() ) ) )
+    if ( TRUE == isFillCompleteOrFirstCycle )
     {
         // close the valves
         valveControlForBCState2FillEnd();
         isBalChamberFillInProgress = FALSE;
-        setDialysatePumpTargetRPM( D48_PUMP, getD48PumpSpeedForBCFill(), TRUE );
+        if ( FALSE == getBalChamberSwitchingOnlyStatus() )
+        {
+            setDialysatePumpTargetRPM( D48_PUMP, getD48PumpSpeedForBCFill(), TRUE );
+        }
 
         //Transition to next state
         state = BAL_CHAMBER_STATE2_FILL_END;
@@ -1116,7 +1121,7 @@
     // Check if a request made was to activate the balancing chamber switching.
     if ( TRUE == isBalChamberSwitchingOnRequested )
     {
-        //Clear the request flag to indicate that the request was processed.
+        //Clear request was processed.
         isBalChamberSwitchingOnRequested = FALSE;
 
         // Set flag to indicate that balancing chamber switching is active
@@ -1277,6 +1282,7 @@
 
                 d48SpeedPostRangeCheck = RANGE( spentDialPumpSpeed, minD48Speed, maxD48Speed );
 
+
                 // Do not turn on the pump if the switching only is enabled in the standby mode.
                 if ( FALSE == getBalChamberSwitchingOnlyStatus() )
                 {