Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rfe345823ec5f2b97b339bf76046ebdd807b60bbd -r973d6d105b9a41869bd5b8403f3aa3f2c60336c1
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision fe345823ec5f2b97b339bf76046ebdd807b60bbd)
+++ 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
@@ -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;