Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -re788fc8f7f5b14f26d2973bd31b41858b9856479 -r70105ec2ac9dbcc9ec1f9166b9a350ff5dc69308
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision e788fc8f7f5b14f26d2973bd31b41858b9856479)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 70105ec2ac9dbcc9ec1f9166b9a350ff5dc69308)
@@ -7,8 +7,8 @@
 *
 * @file    ModePreTreat.c
 *
-* @author  (last)      Michael Garthwaite
-* @date    (last)      16-May-2023
+* @author  (last)      Dara Navaei
+* @date    (last)      02-Jun-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -49,7 +49,7 @@
 #define PRE_TREATMENT_NORMAL_FILL_TARGET_TEMP_C       ( 37.0F + 2.0F )  ///< Pre treatment normal fill target temperature in C.
 
 #define PRE_TREATMENT_MIN_FILL_RESERVOIR_VOLUME_ML    500               ///< Fill reservoir to this volume minimum to prep volume during development.
-#define PRE_TREATMENT_FLUSH_RESERVOIR_VOLUME_ML       500               ///< Fill reservoir to this volume (in mL) to flush filter and lines.
+#define PRE_TREATMENT_FLUSH_RESERVOIR_VOLUME_ML       300               ///< Fill reservoir to this volume (in mL) to flush filter and lines.
 #define PRE_TREATMENT_FILL_RESERVOIR_ONE_VOLUME_ML    1300              ///< Fill reservoir one to this volume (in mL) during pre-treatment mode.
 #define PRE_TREATMENT_FILL_RESERVOIR_TWO_VOLUME_ML    600               ///< Fill reservoir two to this volume (in mL) during pre-treatment mode.
 #define PRE_TREATMENT_FULL_RESERVOIR_VOLUME_ML        1500              ///< Fill reservoir to this volume minimum to prep volume during development.
@@ -520,17 +520,14 @@
             break;
 
         case ALARM_ACTION_END_TREATMENT:
-            if ( HD_PRE_TREATMENT_PRIME_STATE > currentPreTreatmentState )
+            if ( currentPreTreatmentState > HD_PRE_TREATMENT_WATER_SAMPLE_STATE )
             {
-                if ( HD_PRE_TREATMENT_WATER_SAMPLE_STATE == currentPreTreatmentState )
-                {
-                    cmdDGSampleWater( SAMPLE_WATER_CMD_END );
-                }
-                requestNewOperationMode( MODE_STAN );
+                requestNewOperationMode( MODE_POST );
             }
             else
             {
-                requestNewOperationMode( MODE_POST );
+                requestNewOperationMode( MODE_STAN );
+                cmdStopDG();
             }
             break;
 
@@ -1007,7 +1004,7 @@
             cmdStopDGTrimmerHeater();
         }
     }
-    else if ( TRUE == alarmActionResumeReceived )
+    if ( TRUE == alarmActionResumeReceived )
     {
         alarmActionResumeReceived = FALSE;
         setDialInPumpTargetFlowRate( DIP_PATIENT_CONNECTION_FLOW_RATE_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );