Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -r2e21b8a4e52e0d1f94389acf424b5033362b63f1 -r8691c0722f9fa690de0b789a2c020b1ad8e86def
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 2e21b8a4e52e0d1f94389acf424b5033362b63f1)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 8691c0722f9fa690de0b789a2c020b1ad8e86def)
@@ -869,10 +869,10 @@
 
     if ( TRUE == hasDGCompletedReservoirSwitch() )
     {
-        if ( ( DG_MODE_CIRC == dgOpMode ) && ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == dgSubMode ) )
+        if ( ( DG_MODE_GENE == dgOpMode ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == dgSubMode ) )
         {
             state = PRE_TREATMENT_RESERVOIR_MGMT_DRAIN_CMD_RESP_STATE;
-            cmdStartDGDrain( DRAIN_RESERVOIR_TO_VOLUME_ML, TRUE );
+            cmdStartDGDrain( DRAIN_RESERVOIR_TO_VOLUME_ML, TRUE, FALSE );
         }
     }
 
@@ -922,7 +922,7 @@
     DG_OP_MODE_T dgOpMode = getDGOpMode();
     U32 dgSubMode = getDGSubMode();
 
-    if ( ( DG_MODE_CIRC == dgOpMode ) && ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == dgSubMode ) )
+    if ( ( DG_MODE_GENE == dgOpMode ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == dgSubMode ) )
     {
         state = PRE_TREATMENT_RESERVOIR_MGMT_FILL_CMD_RESP_STATE;
 
@@ -989,7 +989,7 @@
     DG_OP_MODE_T dgOpMode = getDGOpMode();
     U32 dgSubMode = getDGSubMode();
 
-    if ( ( DG_MODE_CIRC == dgOpMode ) && ( DG_RECIRCULATE_MODE_STATE_RECIRC_WATER == dgSubMode ) )
+    if ( ( DG_MODE_GENE == dgOpMode ) && ( DG_GEN_IDLE_MODE_STATE_FLUSH_WATER == dgSubMode ) )
     {
         if ( ( TRUE == reservoirFlushedStatus[ DG_RESERVOIR_1 ] ) && ( TRUE == reservoirFlushedStatus[ DG_RESERVOIR_2 ] ) )
         {