Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -rc71a1a94932ab2760fa3002e9740bf00840cd6b5 -r2511d0de0eca7120f6c2241e0938993a460203b1
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision c71a1a94932ab2760fa3002e9740bf00840cd6b5)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 2511d0de0eca7120f6c2241e0938993a460203b1)
@@ -139,7 +139,7 @@
     isBalChamberSwitchingOffRequested           = FALSE;
 
     //TODO:remove once level sensor working
-    bicarbChamberPeriodicFillCounter            = FALSE;
+    bicarbChamberPeriodicFillCounter            = 0;
 
  }
 
Index: firmware/App/Controllers/BalancingChamber.h
===================================================================
diff -u -rc71a1a94932ab2760fa3002e9740bf00840cd6b5 -r2511d0de0eca7120f6c2241e0938993a460203b1
--- firmware/App/Controllers/BalancingChamber.h	(.../BalancingChamber.h)	(revision c71a1a94932ab2760fa3002e9740bf00840cd6b5)
+++ firmware/App/Controllers/BalancingChamber.h	(.../BalancingChamber.h)	(revision 2511d0de0eca7120f6c2241e0938993a460203b1)
@@ -50,7 +50,7 @@
     U32 currentBalChamberSwitchingCounter;                              ///< Current balancing chamber switching counter
     BOOL isPressureStabilizedDuringFill;                                ///< Whether pressure stabilized during fill or not
     BOOL balChamberSWOnlyState;                                         ///< Balancing chamber switching only status ( On/Off)
-    BOOL isBalChamberSwitchingActive;                                    ///< Balancing chamber switching status
+    BOOL isBalChamberSwitchingActive;                                   ///< Balancing chamber switching status
 } BAL_CHAMBER_DATA_T;
 
 // ********** public function prototypes **********
@@ -60,7 +60,6 @@
 U32  execBalancingChamberControl( void );                                // Execute the balancing chamber state machine
 
 void requestBalChamberSwitching( BOOL activate );                        // Activates or Deactivates Balancing Chamber Switching.
-
 void updateBalChamberSwitchingPeriod( void );                            // Update the balancing chamber switching period
 BAL_CHAMBER_EXEC_STATE_T getCurrentBalancingChamberExecState( void );    // Get the current state of the balancing chamber execution
 F32 getBalChamberSwitchingFreq( void );                                  // Get the balancing chamber switching frequency
Index: firmware/App/Modes/ModeFault.c
===================================================================
diff -u -rc71a1a94932ab2760fa3002e9740bf00840cd6b5 -r2511d0de0eca7120f6c2241e0938993a460203b1
--- firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision c71a1a94932ab2760fa3002e9740bf00840cd6b5)
+++ firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 2511d0de0eca7120f6c2241e0938993a460203b1)
@@ -15,6 +15,7 @@
 *
 ***************************************************************************/
 
+#include "BalancingChamber.h"
 #include "ConcentratePumps.h"
 #include "DialysatePumps.h"
 #include "Heaters.h"
Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -rc71a1a94932ab2760fa3002e9740bf00840cd6b5 -r2511d0de0eca7120f6c2241e0938993a460203b1
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision c71a1a94932ab2760fa3002e9740bf00840cd6b5)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 2511d0de0eca7120f6c2241e0938993a460203b1)
@@ -216,8 +216,6 @@
             break;
 
         case DD_GEND_DIALYSATE_BYPASS_STATE:
-            // Activate Balancing Chamber Switching
-            requestBalChamberSwitching( TRUE );
 
             setValveState( D14_VALV, VALVE_STATE_OPEN );
             setValveState( D53_VALV, VALVE_STATE_OPEN );    // Drain valve
@@ -257,6 +255,8 @@
             setRinsePumpState( RINSE_PUMP_STATE_ON );
 
             transitionToBalChamberFill();
+            // Activate Balancing Chamber Switching
+            requestBalChamberSwitching( TRUE );
 
             //Testing
             bypassStateDelayStartTimeMS = getMSTimerCount();
Index: firmware/App/Modes/ModeInitPOST.c
===================================================================
diff -u -rc71a1a94932ab2760fa3002e9740bf00840cd6b5 -r2511d0de0eca7120f6c2241e0938993a460203b1
--- firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision c71a1a94932ab2760fa3002e9740bf00840cd6b5)
+++ firmware/App/Modes/ModeInitPOST.c	(.../ModeInitPOST.c)	(revision 2511d0de0eca7120f6c2241e0938993a460203b1)
@@ -18,6 +18,7 @@
 #include "reg_crc.h"       // Used to hold reset reason code at startup before bits get cleared
 #include "reg_system.h"    // Used to access exception status registers for reset reason code at startup
 
+#include "BalancingChamber.h"
 #include "ConcentratePumps.h"
 #include "ConductivitySensors.h"
 #include "FpgaDD.h"
Index: firmware/App/Modes/ModePostGenDialysate.c
===================================================================
diff -u -rc71a1a94932ab2760fa3002e9740bf00840cd6b5 -r2511d0de0eca7120f6c2241e0938993a460203b1
--- firmware/App/Modes/ModePostGenDialysate.c	(.../ModePostGenDialysate.c)	(revision c71a1a94932ab2760fa3002e9740bf00840cd6b5)
+++ firmware/App/Modes/ModePostGenDialysate.c	(.../ModePostGenDialysate.c)	(revision 2511d0de0eca7120f6c2241e0938993a460203b1)
@@ -15,6 +15,7 @@
 *
 ***************************************************************************/
 
+#include "BalancingChamber.h"
 #include "ConcentratePumps.h"
 #include "DialysatePumps.h"
 #include "Heaters.h"
Index: firmware/App/Modes/ModePreGenDialysate.c
===================================================================
diff -u -rc71a1a94932ab2760fa3002e9740bf00840cd6b5 -r2511d0de0eca7120f6c2241e0938993a460203b1
--- firmware/App/Modes/ModePreGenDialysate.c	(.../ModePreGenDialysate.c)	(revision c71a1a94932ab2760fa3002e9740bf00840cd6b5)
+++ firmware/App/Modes/ModePreGenDialysate.c	(.../ModePreGenDialysate.c)	(revision 2511d0de0eca7120f6c2241e0938993a460203b1)
@@ -15,6 +15,7 @@
 *
 ***************************************************************************/
 
+#include "BalancingChamber.h"
 #include "ConcentratePumps.h"
 #include "DialysatePumps.h"
 #include "DryBiCart.h"
Index: firmware/App/Modes/ModeService.c
===================================================================
diff -u -rc71a1a94932ab2760fa3002e9740bf00840cd6b5 -r2511d0de0eca7120f6c2241e0938993a460203b1
--- firmware/App/Modes/ModeService.c	(.../ModeService.c)	(revision c71a1a94932ab2760fa3002e9740bf00840cd6b5)
+++ firmware/App/Modes/ModeService.c	(.../ModeService.c)	(revision 2511d0de0eca7120f6c2241e0938993a460203b1)
@@ -15,6 +15,7 @@
 *
 ***************************************************************************/
 
+#include "BalancingChamber.h"
 #include "ConcentratePumps.h"
 #include "FpgaDD.h"
 #include "ModeService.h"
Index: firmware/App/Tasks/TaskGeneral.c
===================================================================
diff -u -re79eb4fbdacbc729b0f611f7d27b03ef004dc3da -r2511d0de0eca7120f6c2241e0938993a460203b1
--- firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision e79eb4fbdacbc729b0f611f7d27b03ef004dc3da)
+++ firmware/App/Tasks/TaskGeneral.c	(.../TaskGeneral.c)	(revision 2511d0de0eca7120f6c2241e0938993a460203b1)
@@ -18,6 +18,7 @@
 #include "gio.h"
 #include "lin.h"
 
+#include "BalancingChamber.h"
 #include "BoostPump.h"
 #include "ConcentratePumps.h"
 #include "DialysatePumps.h"
@@ -88,6 +89,9 @@
     // run FP operation mode state machine
     execFPOperationModes();
 
+    // balancing chamber
+    execBalancingChamberControl();
+
     // manage dialysate pump
     execDialysatePumpController();
 
@@ -118,9 +122,6 @@
     // manage rinse pump
     execRinsePumpController();
 
-    // balancing chamber
-    execBalancingChamberControl();
-
     // Monitor RAM error status
     //execRAMMonitor();