Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -ra79db345deaaeef0f1b619dc49d031fdae22d7e6 -rde91824d9790638e0a17fa0278d22a3f57ed28c3
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision a79db345deaaeef0f1b619dc49d031fdae22d7e6)
+++ 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
@@ -301,16 +301,8 @@
     // Close VPi to prevent wasting water
     setValveState( VPI, VALVE_STATE_CLOSED );
 
-    // Request a tare for reservoir 1
-    tareReservoir();
-
-#ifndef V_2_SYSTEM
     // Set the actuators to drain R1
     setValveState( VRD1, VALVE_STATE_OPEN );
-#else
-    // Set the actuators to drain R1
-    setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
-#endif
 
     setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM );
 
@@ -343,21 +335,15 @@
     {
         if ( TRUE == isThisInitialDrain )
         {
-            // Request a tare for reservoir 2
-            tareReservoir();
+            tareLoadCell( LOAD_CELL_RESERVOIR_1_PRIMARY );
+            tareLoadCell( LOAD_CELL_RESERVOIR_1_BACKUP );
         }
 
-#ifndef V_2_SYSTEM
         // Close reservoir 1 drain
         setValveState( VRD1, VALVE_STATE_CLOSED );
         // Set the actuators to drain R2
         // NOTE: Drain pump is already on and VDr is already on drain state
         setValveState( VRD2, VALVE_STATE_OPEN );
-#else
-        // Set the actuators to drain R2
-        // NOTE: Drain pump is already on and VDr is already on drain state
-        setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
-#endif
 
         stateTimerStart = getMSTimerCount();
         rsrvr2Status = DG_RESERVOIR_ABOVE_TARGET;
@@ -395,32 +381,31 @@
 
          if ( TRUE == isThisInitialDrain )
          {
+             tareLoadCell( LOAD_CELL_RESERVOIR_2_PRIMARY );
+             tareLoadCell( LOAD_CELL_RESERVOIR_2_BACKUP );
+
              // Set the actuators to flush drain
              setValveState( VPI, VALVE_STATE_OPEN );
-#ifndef V_2_SYSTEM
              setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
              setValveState( VRD2, VALVE_STATE_CLOSED );
-#else
-             setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NC );
-#endif
 
              state = DG_FLUSH_STATE_FLUSH_DRAIN;
          }
          else
          {
              // Set the actuators to pull fresh water in to drain the circulation line
              setValveState( VPI, VALVE_STATE_OPEN );
-#ifndef V_2_SYSTEM
              setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
              setValveState( VRD2, VALVE_STATE_CLOSED );
-#else
-             setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
-#endif
              setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
              setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
              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;
          }
@@ -449,11 +434,7 @@
 
     if ( TRUE == didTimeout( stateTimerStart, FLUSH_DRAIN_WAIT_TIME_MS ) )
     {
-#ifndef V_2_SYSTEM
         setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
-#else
-        setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
-#endif
         setROPumpTargetFlowRate( RO_PUMP_TARGET_FLOW_RATE_LPM, RO_PUMP_MAX_PRESSURE_PSI );
 
         // Turn on the UV reactors
@@ -488,8 +469,8 @@
         setConcentratePumpTargetSpeed( CONCENTRATEPUMPS_CP2_BICARB, BICARB_PUMP_SPEED_ML_PER_MIN );
 
         // Turn on the concentrate pumps
-        requestConcentratePumpsOn( CONCENTRATEPUMPS_CP1_ACID );
-        requestConcentratePumpsOn( CONCENTRATEPUMPS_CP2_BICARB );
+        requestConcentratePumpOn( CONCENTRATEPUMPS_CP1_ACID );
+        requestConcentratePumpOn( CONCENTRATEPUMPS_CP2_BICARB );
 
         stateTimerStart = getMSTimerCount();
 
@@ -515,8 +496,8 @@
     if ( TRUE == didTimeout( stateTimerStart, FLUSH_CONCENTRATE_STRAWS_TIME_MS ) )
     {
         // Done with flushing the concentrate pumps line
-        requestConcentratePumpsOff( CONCENTRATEPUMPS_CP1_ACID );
-        requestConcentratePumpsOff( CONCENTRATEPUMPS_CP2_BICARB );
+        requestConcentratePumpOff( CONCENTRATEPUMPS_CP1_ACID );
+        requestConcentratePumpOff( CONCENTRATEPUMPS_CP2_BICARB );
 
         setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
         setValveState( VRF, VALVE_STATE_R1_C_TO_NC );
@@ -577,11 +558,8 @@
             setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
             setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
             setValveState( VRO, VALVE_STATE_R2_C_TO_NC );
-#ifndef V_2_SYSTEM
             setValveState( VRD1, VALVE_STATE_OPEN );
-#else
-            setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
-#endif
+
             setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM );
             stateTimerStart = getMSTimerCount();
 
@@ -631,9 +609,7 @@
     {
         // Done with draining R1
         signalDrainPumpHardStop();
-#ifndef V_2_SYSTEM
         setValveState( VRD1, VALVE_STATE_CLOSED );
-#endif
     }
     // Reservoir 1 drain time out
     else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr1Status )
@@ -670,13 +646,15 @@
         if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
         {
             signalROPumpHardStop();
-#ifndef V_2_SYSTEM
             setValveState( VRD1, VALVE_STATE_OPEN );
-#else
-            setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
-#endif
+            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;
@@ -724,11 +702,7 @@
     {
         // Set the actuators to transition to flush circulation
         // The valves are set to do flush drain and flush circulation
-#ifndef V_2_SYSTEM
         setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
-#else
-        setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NC );
-#endif
         setValveState( VRC, VALVE_STATE_RECIRC_C_TO_NC );
         setValveState( VDR, VALVE_STATE_RECIRC_C_TO_NC );
         setROPumpTargetFlowRate( RO_PUMP_TARGET_FLOW_RATE_LPM, RO_PUMP_MAX_PRESSURE_PSI );
@@ -762,11 +736,7 @@
 
     if ( TRUE == didTimeout( stateTimerStart, FLUSH_CIRCULATION_WAIT_TIME_MS ) )
     {
-#ifndef V_2_SYSTEM
         setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
-#else
-        setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
-#endif
         setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
         setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
 
@@ -845,12 +815,8 @@
 
         // Set the actuators
         setValveState( VPI, VALVE_STATE_CLOSED );
-#ifndef V_2_SYSTEM
         setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
         setValveState( VRD2, VALVE_STATE_OPEN );
-#else
-        setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NC );
-#endif
 
         // Set both reservoirs to be considered as full
         rsrvr1Status = DG_RESERVOIR_ABOVE_TARGET;
@@ -877,13 +843,8 @@
 
         if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
         {
-#ifndef V_2_SYSTEM
             setValveState( VRD1, VALVE_STATE_OPEN );
             setValveState( VRD2, VALVE_STATE_CLOSED );
-#else
-            // Set the drain valve to reservoir 1
-            setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
-#endif
         }
     }
     else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr2Status )
@@ -899,9 +860,7 @@
 
         if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
         {
-#ifndef V_2_SYSTEM
             setValveState( VRD2, VALVE_STATE_CLOSED );
-#endif
             // Done with draining
             signalDrainPumpHardStop();