Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r8036381b5c41ab87146c929eeeb9ba073efd4541 -r9d9654c846b21b8e09b0840097e5bf39d58e300f
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 8036381b5c41ab87146c929eeeb9ba073efd4541)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 9d9654c846b21b8e09b0840097e5bf39d58e300f)
@@ -7,8 +7,8 @@
 *
 * @file    ModePreTreat.c
 *
-* @author  (last)      Michael Garthwaite
-* @date    (last)      08-Mar-2023
+* @author  (last)      James Walter Taylor
+* @date    (last)      24-Mar-2023
 *
 * @author  (original)  Dara Navaei
 * @date    (original)  05-Nov-2019
@@ -48,11 +48,11 @@
 #define PRE_TREATMENT_FLUSH_FILL_TARGET_TEMP_C        45.0F             ///< Pre treatment flush fill target temperature in C.
 #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    125               ///< 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_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    750               ///< 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.
+#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_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.
 
 #define PRE_TREATMENT_FLUSH_COUNT                     2                 ///< Number of flush cycles for each reservoir.
 
@@ -1244,13 +1244,18 @@
     PRE_TREATMENT_RESERVOIR_MGMT_STATE_T state = PRE_TREATMENT_RESERVOIR_MGMT_REQUEST_RESERVOIR_SWITCH_STATE;
     DG_OP_MODE_T dgOpMode = getDGOpMode();
     U32 dgSubMode = getDGSubMode();
+    BOOL waitBeforeSwitch = TRUE;
 
     //wait after drain or fill
     if ( ( DG_MODE_GENE == dgOpMode ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == dgSubMode ) )
     {
-        BOOL waitBeforeSwitch = TRUE;
-
         // We do not want to switch over to res 2 final fill until prime is ready for it.
+#ifndef _RELEASE_
+        if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) )
+        {
+            waitBeforeSwitch = FALSE;
+        }
+#endif
         if ( TRUE == reservoirStatus[ DG_RESERVOIR_2 ].fillComplete )
         {
             if ( ( getPreTreatmentSubState() > HD_PRE_TREATMENT_PRIME_STATE ) ||
@@ -1340,7 +1345,7 @@
      {
  #ifndef _RELEASE_
          if ( ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_PRIMING ) ) ||
-              ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_WET_SELF_TEST ) ) )
+                 ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_DISABLE_WET_SELF_TEST ) ) )
          {
              if ( DG_RESERVOIR_1 == inactiveRes )
              {