Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -r07f24040a1f6773ceef7b6691eb9073cdccd4ffb -rbb8d23755bc6f2d3016bde413fbdd32d31fa9838
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 07f24040a1f6773ceef7b6691eb9073cdccd4ffb)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision bb8d23755bc6f2d3016bde413fbdd32d31fa9838)
@@ -49,14 +49,15 @@
 #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                ( 60 * MS_PER_SECOND )                            ///< Flush dialysate wait time in milliseconds.
 
 // Flush concentrate straws state defines
 #define FLUSH_CONCENTRATE_STRAWS_TIME_MS            ( 3 * 60 * MS_PER_SECOND )                        ///< Flush concentrate straws wait time in milliseconds. todo was 3 minutes
 #define ACID_PUMP_SPEED_ML_PER_MIN                  -30.0F                                            ///< 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.6F                                             ///< Bicarb pump speed in mL/min.
 
@@ -306,6 +307,7 @@
 
     // Close VPi to prevent wasting water
     setValveState( VPI, VALVE_STATE_CLOSED );
+
     // Set the actuators to drain R1
     setValveState( VRD1, VALVE_STATE_OPEN );
 
@@ -883,12 +885,6 @@
 
             // Raise the alarm
             failFlushMode();
-
-            // If the caps alarm was active, clear it at the of the cancel water path
-            if ( TRUE == isAlarmActive( ALARM_ID_DG_DIALYSATE_OR_CONC_CAP_NOT_IN_PROPER_POSITION ) )
-            {
-                clearAlarmCondition( ALARM_ID_DG_DIALYSATE_OR_CONC_CAP_NOT_IN_PROPER_POSITION );
-            }
         }
     }
     else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr1Status )
@@ -1072,7 +1068,7 @@
             prevFlushState              = flushState;
             flushState                  = DG_FLUSH_STATE_CANCEL_WATER_PATH;
             alarmDetectedPendingTrigger = ALARM_ID_DG_DIALYSATE_OR_CONC_CAP_NOT_IN_PROPER_POSITION;
-         }
+        }
     }
 }