Index: firmware/App/Controllers/SpentChamberFill.c
===================================================================
diff -u -r0a74bcce6674271e35d5154003dd6c25011f80f9 -re6415d33321e7990c3b5e82b0c8a87c64cc3a2c8
--- firmware/App/Controllers/SpentChamberFill.c	(.../SpentChamberFill.c)	(revision 0a74bcce6674271e35d5154003dd6c25011f80f9)
+++ firmware/App/Controllers/SpentChamberFill.c	(.../SpentChamberFill.c)	(revision e6415d33321e7990c3b5e82b0c8a87c64cc3a2c8)
@@ -230,6 +230,8 @@
         // start acid and bicarb pump with the expected quantity
         setConcentratePumpTargetSpeed( D11_PUMP, CONCENTRATE_PUMP_MAX_SPEED, acidDoseVolume );
         setConcentratePumpTargetSpeed( D10_PUMP, CONCENTRATE_PUMP_MAX_SPEED, bicarbDoseVolume );
+        requestConcentratePumpOn( D11_PUMP );
+        requestConcentratePumpOn( D10_PUMP );
 
         state = SPENT_CHAMBER_FILL_STATE1_DOSING_CNTRL;
     }
@@ -317,6 +319,8 @@
         // start acid and bicarb pump with the expected quantity
         setConcentratePumpTargetSpeed( D11_PUMP, CONCENTRATE_PUMP_MAX_SPEED, acidDoseVolume );
         setConcentratePumpTargetSpeed( D10_PUMP, CONCENTRATE_PUMP_MAX_SPEED, bicarbDoseVolume );
+        requestConcentratePumpOn( D11_PUMP );
+        requestConcentratePumpOn( D10_PUMP );
 
         state = SPENT_CHAMBER_FILL_STATE2_DOSING_CNTRL;
     }
Index: firmware/App/Controllers/SpentChamberFill.h
===================================================================
diff -u -r89cf53e72625123054b11897c2e0a8359d82b7ce -re6415d33321e7990c3b5e82b0c8a87c64cc3a2c8
--- firmware/App/Controllers/SpentChamberFill.h	(.../SpentChamberFill.h)	(revision 89cf53e72625123054b11897c2e0a8359d82b7ce)
+++ firmware/App/Controllers/SpentChamberFill.h	(.../SpentChamberFill.h)	(revision e6415d33321e7990c3b5e82b0c8a87c64cc3a2c8)
@@ -32,9 +32,9 @@
 // ********** public definitions **********
 
 #define FRESH_DIAL_FILL_PRESSURE_MIN_PSIG          22.0F                ///< Minimum fresh dialysate pressure (D18) limit for spent chamber fill operations.
-#define FRESH_DIAL_FILL_PRESSURE_MAX_PSIG          28.0F                ///< Maximum fresh dialysate pressure (D18) limit for spent chamber fill operations.
+#define FRESH_DIAL_FILL_PRESSURE_MAX_PSIG          30.0F                ///< Maximum fresh dialysate pressure (D18) limit for spent chamber fill operations.
 #define SPENT_DIAL_FILL_PRESSURE_MIN_PSIG          24.0F                ///< Minimum spent dialysate pressure (D51) limit for spent chamber fill operations.
-#define SPENT_DIAL_FILL_PRESSURE_MAX_PSIG          28.0F                ///< Maximum spent dialysate pressure (D51) limit for spent chamber fill operations.
+#define SPENT_DIAL_FILL_PRESSURE_MAX_PSIG          30.0F                ///< Maximum spent dialysate pressure (D51) limit for spent chamber fill operations.
 
 /// spent chamber fill data structure
 typedef struct
Index: firmware/App/DDCommon.h
===================================================================
diff -u -r0a74bcce6674271e35d5154003dd6c25011f80f9 -re6415d33321e7990c3b5e82b0c8a87c64cc3a2c8
--- firmware/App/DDCommon.h	(.../DDCommon.h)	(revision 0a74bcce6674271e35d5154003dd6c25011f80f9)
+++ firmware/App/DDCommon.h	(.../DDCommon.h)	(revision e6415d33321e7990c3b5e82b0c8a87c64cc3a2c8)
@@ -40,7 +40,7 @@
 //#define __PITEST__              1
 
 //Uncomment below if diener concentrate pump used
-#define __DIENER_CONC_PUMP__      1
+//#define __DIENER_CONC_PUMP__      1
 
 //Uncomment below if beta hardware is used
 //#define __BETA_HW_VER__           1
@@ -58,10 +58,10 @@
 #define __SPENT_CHAMBER_FILL__    1
 
 //Uncomment below for bicarb chamber filling
-#define __BICARB_CHAMBER_FILL__   1
+//#define __BICARB_CHAMBER_FILL__   1
 
 //Uncomment below if balancing chamber pressure alarm is required
-#define __BC_PRESSURE_ALARM__     1
+//#define __BC_PRESSURE_ALARM__     1
 
 //Uncomment below to disable heaters debug message
 #define __HEATERS_DEBUG__         1
Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -r0a74bcce6674271e35d5154003dd6c25011f80f9 -re6415d33321e7990c3b5e82b0c8a87c64cc3a2c8
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 0a74bcce6674271e35d5154003dd6c25011f80f9)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision e6415d33321e7990c3b5e82b0c8a87c64cc3a2c8)
@@ -59,7 +59,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                    7                                           ///< Total number of spent chamber fill allowed.
+#define SPENT_CHAMBER_FILL_MAX_COUNT                    15                                           ///< 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.,