Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -r3efd50bef6d3618b9fed1727aa2bc234ededee2a -reeaab2a9a685fb18845888d91040d3aa01977f6d
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 3efd50bef6d3618b9fed1727aa2bc234ededee2a)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision eeaab2a9a685fb18845888d91040d3aa01977f6d)
@@ -7,8 +7,8 @@
 *
 * @file    ModeDrain.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      18-Jan-2023
+* @author  (last)      Michael Garthwaite
+* @date    (last)      16-May-2023
 *
 * @author  (original)  Leonardo Baloa
 * @date    (original)  20-Dec-2019
@@ -39,7 +39,7 @@
 
 // ********** private definitions **********
 
-#define TARGET_DRAIN_PUMP_RPM                    2400                                                  ///< Target drain pump speed (in RPM).
+#define TARGET_DRAIN_PUMP_RPM                    2200                                                  ///< Target drain pump speed (in RPM).
 #define DRAIN_WEIGHT_UNCHANGE_TIMEOUT_MS         ( 2 * MS_PER_SECOND )                                 ///< Time period of unchanged weight during draining before timeout.
 
 #define DRAIN_EMPTY_TARE_WAIT                    ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )             /// Time period to wait after drain complete and before taring load cells.
@@ -113,6 +113,7 @@
 {
     // re-initialize each time we transition to drain mode
     initDrainMode();
+    setCurrentSubState( NO_SUB_STATE );
 
     DG_RESERVOIR_ID_T inactiveReservoir = getInactiveReservoir();
 
@@ -263,7 +264,6 @@
         acidBottleVolML   = acid.acidConcentrate[ CAL_DATA_ACID_CONCENTRATE_1 ].acidFullBottleVolumeML;
         bicarbBottleVolML = bicarb.bicarbConcentrate[ CAL_DATA_BICARB_CONCENTRATE_1 ].bicarbStartVolumeML;
 
-
         if ( DG_RESERVOIR_1 == inactiveReservoir )
         {
             setValveState( VRD1, VALVE_STATE_CLOSED );