Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r82bd1d24c050e79690a7f5b236e49dd7db7e2a91 -r973d6d105b9a41869bd5b8403f3aa3f2c60336c1
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 82bd1d24c050e79690a7f5b236e49dd7db7e2a91)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 973d6d105b9a41869bd5b8403f3aa3f2c60336c1)
@@ -7,8 +7,8 @@
 *
 * @file    ModePreTreat.c
 *
-* @author  (last)      Dara Navaei
-* @date    (last)      17-May-2023
+* @author  (last)      Sean Nash
+* @date    (last)      22-May-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       400               ///< 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;