Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -rac1d91ed684d7c4fd67e7aa3352b90c93b81675d -rc400845083cc6fc90f70f308ae953e05b45acbf8
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision ac1d91ed684d7c4fd67e7aa3352b90c93b81675d)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision c400845083cc6fc90f70f308ae953e05b45acbf8)
@@ -60,7 +60,7 @@
 #define LINEAR_SLOPE_FACTOR                             -0.0029F                                    ///< Slope factor used in adjusted dialysate temperature linear calculation for high Qds
 #define LINEAR_INTERCEPT_FACTOR                         3.47F                                       ///< Intercept factor used in adjusted dialysate temperature linear calculation for high Qds
 #define LOW_DIAL_FLOW_RATE                              150.0F                                      ///< Dialysate flow rate lesser than 150 considered to be low Qds.
-#define SPENT_CHAMBER_FILL_MAX_COUNT                    15                                           ///< Total number of spent chamber fill allowed.
+#define SPENT_CHAMBER_FILL_MAX_COUNT                    10                                          ///< Total number of spent chamber fill allowed.
 #define BICARB_CHAMBER_FILL_TIMEOUT                    ( 1 * MS_PER_SECOND )                        ///< Bicarb chamber fill timeout.
 //Testing
 #define DELAY_BC_SWITCHING_AT_START_UP          ( 10 * MS_PER_SECOND )                              ///< Provide a balancing chamber switching start up delay to stabilize pump speed etc.,
@@ -624,9 +624,10 @@
  *************************************************************************/
 static DD_GEND_MODE_STATE_T handleGenDDialysateDeliveryState( void )
 {
-    DD_GEND_MODE_STATE_T state       = DD_GEND_DIALYSATE_DELIVERY_STATE;
-    LEVEL_STATE_T spentChamberLevel  = getLevelStatus( D46_LEVL );
-    LEVEL_STATE_T bicarbChamberLevel = getLevelStatus( D63_LEVL );
+    DD_GEND_MODE_STATE_T state              = DD_GEND_DIALYSATE_DELIVERY_STATE;
+    LEVEL_STATE_T spentChamberLevel         = getLevelStatus( D46_LEVL );
+    LEVEL_STATE_T bicarbChamberLevel        = getLevelStatus( D63_LEVL );
+    BOOL balancingChambFillInProgress       = getBalancingChamberFillinProgressStatus();
 
     // if TD asks for bypass or dialysate is not good to deliver
     //transition to bypass dialystate state