Index: firmware/App/Controllers/BalancingChamber.h
===================================================================
diff -u -r977f03e20990ed5579160b9b927df1c0f2428101 -r1b110e3b2462fda74aa8f2811aad9ce61cb80309
--- firmware/App/Controllers/BalancingChamber.h	(.../BalancingChamber.h)	(revision 977f03e20990ed5579160b9b927df1c0f2428101)
+++ firmware/App/Controllers/BalancingChamber.h	(.../BalancingChamber.h)	(revision 1b110e3b2462fda74aa8f2811aad9ce61cb80309)
@@ -31,10 +31,10 @@
 
 // ********** public definitions **********
 
-#define FRESH_DIAL_PRESSURE_MIN_PSIG                22.0F              ///< Minimum fresh dialysate pressure (D18) limit for balancing chamber fill operations.
-#define FRESH_DIAL_PRESSURE_MAX_PSIG                28.0F              ///< Maximum fresh dialysate pressure (D18) limit for balancing chamber fill operations.
-#define SPENT_DIAL_PRESSURE_MIN_PSIG                30.0F              ///< Minimum spent dialysate pressure (D51) limit for balancing chamber fill operations.
-#define SPENT_DIAL_PRESSURE_MAX_PSIG                40.0F              ///< Maximum spent dialysate pressure (D51) limit for balancing chamber fill operations.
+#define FRESH_DIAL_PRESSURE_MIN_PSIG                23.0F              ///< Minimum fresh dialysate pressure (D18) limit for balancing chamber fill operations.
+#define FRESH_DIAL_PRESSURE_MAX_PSIG                27.0F              ///< Maximum fresh dialysate pressure (D18) limit for balancing chamber fill operations.
+#define SPENT_DIAL_PRESSURE_MIN_PSIG                33.0F              ///< Minimum spent dialysate pressure (D51) limit for balancing chamber fill operations.
+#define SPENT_DIAL_PRESSURE_MAX_PSIG                37.0F              ///< Maximum spent dialysate pressure (D51) limit for balancing chamber fill operations.
 #define BC_FRESH_FILL_PRESSURE_PSIG                 15.0F              ///< Fresh side pressure (drop) during balancing chamber switching, indicates fill has been started / in progress.
 #define BC_SPENT_FILL_PRESSURE_PSIG                 29.0F              ///< Spent side pressure (drop) during balancing chamber switching, indicates fill has been started / in progress.
 #define BAL_CHAMBER_FILL_VOLUME_ML                  30.0F              ///< Balancing chamber fill/drain volume per batch operation.
Index: firmware/App/Controllers/DialysatePumps.c
===================================================================
diff -u -r6f961c6e113a4076ba9d5f97e078a398a8976d7c -r1b110e3b2462fda74aa8f2811aad9ce61cb80309
--- firmware/App/Controllers/DialysatePumps.c	(.../DialysatePumps.c)	(revision 6f961c6e113a4076ba9d5f97e078a398a8976d7c)
+++ firmware/App/Controllers/DialysatePumps.c	(.../DialysatePumps.c)	(revision 1b110e3b2462fda74aa8f2811aad9ce61cb80309)
@@ -47,7 +47,7 @@
 #define DIALYSATE_PUMP_CONTROL_RUN                          0x01                                                    ///< Dialysate pump control run pump.
 #define DIALYSATE_PUMP_CONTROL_STOP                         0x00                                                    ///< Dialysate pump control stop pump.
 #define DIALYSATE_PUMP_FORWARD_DIR                          1                                                       ///< Dialysate pump forward direction. reverse direction is not allowed.
-#define DIALYSATE_PUMP_RAMP_SPEED_INCREMENT                 10.0F                                                   ///< Speed increase when controlling dialysate pump ramp to target step speed.
+#define DIALYSATE_PUMP_RAMP_SPEED_INCREMENT                 50.0F                                                   ///< Speed increase when controlling dialysate pump ramp to target step speed.
 #define ZERO_SPEED                                          0.0F                                                    ///< Zero speed/RPM value.
 
 #define DIALYSATE_PUMP_MAX_CURRENT_WHEN_OFF_A               0.1F                                                    ///< Dialysate pump maximum current when the pump is off in amps.
Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -r711ff90b0aab45c4acde333f4c9f11be9b62f383 -r1b110e3b2462fda74aa8f2811aad9ce61cb80309
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 711ff90b0aab45c4acde333f4c9f11be9b62f383)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 1b110e3b2462fda74aa8f2811aad9ce61cb80309)
@@ -549,11 +549,14 @@
 {
     DD_GEND_MODE_STATE_T state              = DD_GEND_DIALYSATE_BYPASS_STATE;
     BOOL balancingChambFillInProgress       = getBalancingChamberFillinProgressStatus();
+    F32 freshDialPressure                   = getFilteredPressure( D18_PRES );
+    F32 spentDialPressure                   = getFilteredPressure( D51_PRES );
 
-    //Testing
+    //Testing : Wait for the fresh and spent pressure in range or timeout
     if ( TRUE == delayBypassStateFlag )
     {
-        if (  TRUE == didTimeout( bypassStateDelayStartTimeMS, DELAY_BC_SWITCHING_AT_START_UP ) )
+        if ( ( ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) ) ||
+             (  TRUE == didTimeout( bypassStateDelayStartTimeMS, DELAY_BC_SWITCHING_AT_START_UP ) ) )
         {
             delayBypassStateFlag = FALSE;
         }