Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -r26f63d0260a3c35277e3e6dbca3573c253775318 -r1b95ae077de1d01a314be8cc011662ab508fba10
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 26f63d0260a3c35277e3e6dbca3573c253775318)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 1b95ae077de1d01a314be8cc011662ab508fba10)
@@ -48,13 +48,13 @@
 #define DRAIN_WEIGHT_UNCHANGE_TIMEOUT               ( 6 * MS_PER_SECOND )                             ///< Time period of unchanged weight during draining before timeout.
 
 // Flush drain path state defines
-#define FLUSH_DRAIN_WAIT_TIME_MS                    ( 2 * MS_PER_SECOND )                             ///< Flush Drain path wait time in milliseconds. TODo it was 2 minutes
+#define FLUSH_DRAIN_WAIT_TIME_MS                    ( 2 * 60 * MS_PER_SECOND )                        ///< Flush Drain path wait time in milliseconds.
 
 // Flush dialysate state defines
-#define FLUSH_DIALYSATE_WAIT_TIME_MS                ( 0.5 * 60 * MS_PER_SECOND )                      ///< Flush dialysate wait time in milliseconds.
+#define FLUSH_DIALYSATE_WAIT_TIME_MS                ( 1 * 60 * MS_PER_SECOND )                        ///< Flush dialysate wait time in milliseconds.
 
 // Flush concentrate straws state defines
-#define FLUSH_CONCENTRATE_STRAWS_TIME_MS            ( 0.5 * 60 * MS_PER_SECOND )                      ///< Flush concentrate straws wait time in milliseconds. todo was 3 minutes
+#define FLUSH_CONCENTRATE_STRAWS_TIME_MS            ( 3 * 60 * MS_PER_SECOND )                        ///< Flush concentrate straws wait time in milliseconds.
 #define ACID_PUMP_SPEED_ML_PER_MIN                  -30.0                                             ///< Acid pump speed in mL/min.
 // The bicarb pump is 2% faster than the acid pump to create a flow from acid to bicarb line during flush
 #define BICARB_PUMP_SPEED_ML_PER_MIN                30.6                                              ///< Bicarb pump speed in mL/min.
@@ -302,6 +302,7 @@
 
     // Close VPi to prevent wasting water
     setValveState( VPI, VALVE_STATE_CLOSED );
+
     // Set the actuators to drain R1
     setValveState( VRD1, VALVE_STATE_OPEN );
 
@@ -336,7 +337,6 @@
     {
         if ( TRUE == isThisInitialDrain )
         {
-            // Request a tare for reservoir 1
             tareLoadCell( LOAD_CELL_RESERVOIR_1_PRIMARY );
             tareLoadCell( LOAD_CELL_RESERVOIR_1_BACKUP );
         }