Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rfb7b90110c095be1aa8b3ad4dc26fa21e8acc851 -raebdf67df150ede34d59d58571c2c6c6822da3ea
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision fb7b90110c095be1aa8b3ad4dc26fa21e8acc851)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision aebdf67df150ede34d59d58571c2c6c6822da3ea)
@@ -133,7 +133,10 @@
 
     reservoirFilledStatus[ DG_RESERVOIR_1 ] = FALSE;
     reservoirFilledStatus[ DG_RESERVOIR_2 ] = FALSE;
+    reservoirFlushedStatus[ DG_RESERVOIR_1 ] = FALSE;
+    reservoirFlushedStatus[ DG_RESERVOIR_2 ] = FALSE;
 
+
     reservoirFlags[ DG_RESERVOIR_1 ].startFlushFill = FALSE;
     reservoirFlags[ DG_RESERVOIR_1 ].startNormalFill = FALSE;
     reservoirFlags[ DG_RESERVOIR_2 ].startFlushFill = FALSE;
@@ -959,8 +962,8 @@
     if ( TRUE == fillReservoirOneStartRequested )
     {
         fillReservoirOneStartRequested = FALSE;
-        cmdSetDGActiveReservoir( DG_RESERVOIR_2 );
-        state = PRE_TREATMENT_RESERVOIR_MGMT_DRAIN_CMD_STATE;
+        //cmdSetDGActiveReservoir( DG_RESERVOIR_2 );
+        state = PRE_TREATMENT_RESERVOIR_MGMT_REQUEST_RESERVOIR_SWITCH_STATE;
     }
 
     return state;
@@ -1064,7 +1067,7 @@
             volume = getPreTreatmentFillVolume( inactiveReservoir );
 
             // not flushed and need to fill
-            if ( ( FALSE == reservoirFlushedStatus[ inactiveReservoir ] ) &&
+            if ( ( TRUE != reservoirFlushedStatus[ inactiveReservoir ] ) &&
                ( TRUE == reservoirFlags[ inactiveReservoir ].startFlushFill ) )
             {
                 cmdStartDGFill( volume, DEFAULT_TARGET_FILL_FLOW_RATE_LPM );