Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -r9e5ee62245eb2a73b167eabd6c274a71a76a7b0e -r6010396441e574f793e06ab4656f5084d54bd950
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 9e5ee62245eb2a73b167eabd6c274a71a76a7b0e)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 6010396441e574f793e06ab4656f5084d54bd950)
@@ -145,7 +145,7 @@
     prevFlushState                            = DG_FLUSH_STATE_START;
     flushUIState                              = FLUSH_UI_STATE_NOT_RUNNING;
     rsrvrFillStableTimeCounter                = 0;
-    overallFlushElapsedTimeStart              = 0;
+    overallFlushElapsedTimeStart              = getMSTimerCount();
     isThisInitialDrain                        = TRUE;
     dataPublishCounter                        = 0;
     rsrvr1Status                              = NUM_OF_DG_RESERVOIR_STATUS;
@@ -154,7 +154,7 @@
     flushLinesVolumeL                         = 0.0F;
     haveDrainParamsBeenInit[ DG_RESERVOIR_1 ] = FALSE;
     haveDrainParamsBeenInit[ DG_RESERVOIR_2 ] = FALSE;
-    stateTimerStart                           = 0;
+    stateTimerStart                           = getMSTimerCount();
     hasFlushStatusBeenWrittenToNV             = FALSE;
 }
 
@@ -1019,8 +1019,8 @@
  * The getRsrvrDrainStatus function returns the status of draining a
  * reservoir. If the drain times out, it set the status to did not reach
  * target.
- * @details Inputs: rsrvrFillStableTimeCounter, alarm, stateTimer
- * @details Outputs: rsrvrFillStableTimeCounter, alarm, stateTimer,
+ * @details Inputs: alarm, stateTimer
+ * @details Outputs: alarm, stateTimer,
  * prevFlushState
  * @param r is DG_RESERVOIR_1 or DG_RESERVOIR_2
  * @param drainSteadyStateTimeout which is the time the reservoir's level