Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -r2c4dfa08ac8ead07939b4f6aba3b0073e0997706 -r81dc975f13b9308e40aa0e33e0eca2d407276d44
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 2c4dfa08ac8ead07939b4f6aba3b0073e0997706)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 81dc975f13b9308e40aa0e33e0eca2d407276d44)
@@ -54,7 +54,7 @@
 #define FLUSH_DIALYSATE_WAIT_TIME_MS                ( 0.5 * 60 * MS_PER_SECOND )                      ///< Flush dialysate wait time in milliseconds.
 
 // Flush concentrate straws state defines
-#define FLUSH_CONCENTRATE_STRAWS_TIME_MS            ( 2 * 1 * MS_PER_SECOND )                        ///< Flush concentrate straws wait time in milliseconds. todo was 3 minutes
+#define FLUSH_CONCENTRATE_STRAWS_TIME_MS            ( 0.5 * 60 * MS_PER_SECOND )                        ///< Flush concentrate straws wait time in milliseconds. todo was 3 minutes
 #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.
@@ -65,7 +65,7 @@
 #define RSRVRS_FULL_STABLE_TIME_COUNT               ( ( 4 * MS_PER_SECOND ) / TASK_GENERAL_INTERVAL ) ///< Reservoirs 1 & 2 full stable time in counts.
 #define RSRVRS_FILL_UP_TIMEOUT_MS                   ( 5 * 60 * MS_PER_SECOND )                        ///< Reservoirs 1 & 2 full fill up timeout in ms.
 #define RSRVRS_PARTIAL_FILL_TIMEOUT_MS              ( 2 * 60 * MS_PER_SECOND )                        ///< Reservoirs 1 & 2 partial fill up timeout in ms.
-#define RSRVRS_DRAIN_TIMEOUT_MS                     ( 3 * 60 * MS_PER_SECOND )                        ///< Reservoirs 1 & 2 drain timeout in ms.
+#define RSRVRS_DRAIN_TIMEOUT_MS                     ( 2 * 60 * MS_PER_SECOND )                        ///< Reservoirs 1 & 2 drain timeout in ms.
 #define FINAL_DRAIN_RO_PUMP_FLOW_LPM                0.6                                               ///< Final drain RO pump flow rate in L/min. This is used to flush the drain line during drain.
 
 // Flush drain line state defines