Index: firmware/App/Controllers/SpentChamberFill.h
===================================================================
diff -u -rc51c9d66062c27c588006850550b412ea7dd5144 -r89cf53e72625123054b11897c2e0a8359d82b7ce
--- firmware/App/Controllers/SpentChamberFill.h	(.../SpentChamberFill.h)	(revision c51c9d66062c27c588006850550b412ea7dd5144)
+++ firmware/App/Controllers/SpentChamberFill.h	(.../SpentChamberFill.h)	(revision 89cf53e72625123054b11897c2e0a8359d82b7ce)
@@ -31,8 +31,8 @@
 
 // ********** public definitions **********
 
-#define FRESH_DIAL_FILL_PRESSURE_MIN_PSIG          22.0F                ///< Minimum fresh dialysate pressure (D18) limit for balancing chamber fill operations.
-#define FRESH_DIAL_FILL_PRESSURE_MAX_PSIG          28.0F                ///< Maximum fresh dialysate pressure (D18) limit for balancing chamber fill operations.
+#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 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.
 
Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -rc51c9d66062c27c588006850550b412ea7dd5144 -r89cf53e72625123054b11897c2e0a8359d82b7ce
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision c51c9d66062c27c588006850550b412ea7dd5144)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision 89cf53e72625123054b11897c2e0a8359d82b7ce)
@@ -265,6 +265,7 @@
             setValveState( D35_VALV, VALVE_STATE_CLOSED );  // VDI
             setValveState( D40_VALV, VALVE_STATE_CLOSED );  // VDO
             setValveState( D34_VALV, VALVE_STATE_OPEN );    // Bypass valve
+            setValveState( D47_VALV, VALVE_STATE_OPEN );    // Spent chamber purge valve
             setDialysatePumpTargetRPM( D48_PUMP, SPENT_DIAL_PUMP_FILL_RPM, TRUE );
             break;
 
@@ -563,6 +564,12 @@
         setModeGenDStateTransition( DD_GEND_DIALYSATE_BYPASS_STATE );
         isDialDeliveryInProgress.data = FALSE;
         state = DD_GEND_DIALYSATE_BYPASS_STATE;
+
+        //Trigger alarm if count exceeded
+        if ( totalSpentChamberFill >= SPENT_CHAMBER_FILL_MAX_COUNT )
+        {
+            SET_ALARM_WITH_2_U32_DATA( ALARM_ID_DD_SC_FILL_TIMEOUT_FAULT, SPENT_CHAMBER_FILL_MAX_COUNT, 0 )
+        }
     }
     else
     {
Index: firmware/App/Modes/ModeGenDialysate.h
===================================================================
diff -u -rc51c9d66062c27c588006850550b412ea7dd5144 -r89cf53e72625123054b11897c2e0a8359d82b7ce
--- firmware/App/Modes/ModeGenDialysate.h	(.../ModeGenDialysate.h)	(revision c51c9d66062c27c588006850550b412ea7dd5144)
+++ firmware/App/Modes/ModeGenDialysate.h	(.../ModeGenDialysate.h)	(revision 89cf53e72625123054b11897c2e0a8359d82b7ce)
@@ -33,7 +33,7 @@
 
 #define FRESH_DIAL_PUMP_INITIAL_RPM             2500                                        ///< Nominal RPM target for fresh dialysate pump to maintain required pressure.
 #define SPENT_DIAL_PUMP_INITIAL_RPM             2300                                        ///< Nominal RPM target for spent dialysate pump to maintain required pressure.
-#define SPENT_DIAL_PUMP_FILL_RPM                1500                                        ///< Nominal RPM target for spent chamber fill operations.
+#define SPENT_DIAL_PUMP_FILL_RPM                400                                        ///< Nominal RPM target for spent chamber fill operations.
 
 /// Generate dialysate mode data structure
 typedef struct