Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -rc4c90551130d037cdf7ea7494d9e4877010e2999 -rde91824d9790638e0a17fa0278d22a3f57ed28c3
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision c4c90551130d037cdf7ea7494d9e4877010e2999)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision de91824d9790638e0a17fa0278d22a3f57ed28c3)
@@ -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 * 60 * MS_PER_SECOND )                        ///< Flush Drain path wait time in milliseconds.
+#define FLUSH_DRAIN_WAIT_TIME_MS                    ( 2  * MS_PER_SECOND )                        ///< Flush Drain path wait time in milliseconds. TODo it was 2 minutes
 
 // Flush dialysate state defines
 #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            ( 3 * 60 * MS_PER_SECOND )                        ///< Flush concentrate straws wait time in milliseconds.
+#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
@@ -402,6 +402,10 @@
              setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
              setROPumpTargetFlowRate( FINAL_DRAIN_RO_PUMP_FLOW_LPM, RO_PUMP_MAX_PRESSURE_PSI );
 
+             // Turn on the UV reactors
+             turnOnUVReactor( INLET_UV_REACTOR );
+             turnOnUVReactor( OUTLET_UV_REACTOR );
+
              flushUIState = FLUSH_UI_STATE_FLUSH_RECIRCULATION_PATH;
              state = DG_FLUSH_STATE_FLUSH_CIRCULATION_DRAIN_LINE;
          }
@@ -643,8 +647,14 @@
         {
             signalROPumpHardStop();
             setValveState( VRD1, VALVE_STATE_OPEN );
+            setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
             setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM );
 
+            // Turn off the UV reactors prior to transitioning to drain states.
+            // In the drain states, there is not fluid flowing in the RO section so the reactors are turned off
+            turnOffUVReactor( INLET_UV_REACTOR );
+            turnOffUVReactor( OUTLET_UV_REACTOR );
+
             stateTimerStart = getMSTimerCount();
             isThisInitialDrain = FALSE;
             rsrvr1Status = DG_RESERVOIR_ABOVE_TARGET;