Index: firmware/App/Controllers/Valves.c
===================================================================
diff -u -r4d7d40a27130dc813d653f044cbb856b1b7d8481 -r379f78f1fad668d741b3ccf1e78c69f3fccc45b5
--- firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 4d7d40a27130dc813d653f044cbb856b1b7d8481)
+++ firmware/App/Controllers/Valves.c	(.../Valves.c)	(revision 379f78f1fad668d741b3ccf1e78c69f3fccc45b5)
@@ -130,30 +130,51 @@
             if ( ( valveID == VPI ) || ( valveID == VBF ) || ( valveID == VSP ) )
             {
                 result = TRUE;
-            }
+            }
+#ifndef V_2_SYSTEM
+            if ( ( VRD1 == valveID ) || ( VRD2 == valveID ) )
+            {
+                result = TRUE;
+            }
+#endif
             break;
 
         case VALVE_STATE_CLOSED:
             if ( ( valveID == VPI ) || ( valveID == VBF ) || ( valveID == VSP ) )
             {
                 result = TRUE;
-            }
-            break;
+            }
+#ifndef V_2_SYSTEM
+            if ( ( VRD1 == valveID ) || ( VRD2 == valveID ) )
+            {
+                result = TRUE;
+            }
+#endif
+            break;
 
-        case VALVE_STATE_OPEN_C_TO_NO:
-            if ( valveID == VPD )
-            {
-                result = TRUE;
-            }
-            break;
+#ifndef V_2_SYSTEM
+        case VALVE_STATE_OPEN_C_TO_NC:
+            if ( VPD == valveID )
+            {
+                result = TRUE;
+            }
+            break;
+#else
+        case VALVE_STATE_OPEN_C_TO_NO:
+            if ( VPD == valveID )
+            {
+                result = TRUE;
+            }
+            break;
+
+        case VALVE_STATE_DRAIN_C_TO_NC:
+            if ( VPD == valveID )
+            {
+                result = TRUE;
+            }
+            break;
+#endif
 
-        case VALVE_STATE_DRAIN_C_TO_NC:
-            if ( valveID == VPD )
-            {
-                result = TRUE;
-            }
-            break;
-
         case VALVE_STATE_NOFILL_C_TO_NO:
             if ( valveID == VPO )
             {
@@ -165,14 +186,20 @@
             if ( valveID == VPO )
             {
                 result = TRUE;
-            }
+            }
             break;
 
         case VALVE_STATE_DRAIN_C_TO_NO:
             if ( ( valveID == VDR ) || ( valveID == VRC ) )
             {
                 result = TRUE;
-            }
+            }
+#ifndef V_2_SYSTEM
+            if ( VPD == valveID )
+            {
+                result = TRUE;
+            }
+#endif
             break;
 
         case VALVE_STATE_RECIRC_C_TO_NC:
@@ -281,14 +308,20 @@
         case VALVE_STATE_CLOSED:
             vState = DEENERGIZED;
             break;
-
+
+#ifdef V_2_SYSTEM
         case VALVE_STATE_OPEN_C_TO_NO:
             vState = DEENERGIZED;
             break;
 
         case VALVE_STATE_DRAIN_C_TO_NC:
             vState = ENERGIZED;
-            break;
+            break;
+#else
+        case VALVE_STATE_OPEN_C_TO_NC:
+            vState = ENERGIZED;
+            break;
+#endif
 
         case VALVE_STATE_NOFILL_C_TO_NO:
             vState = DEENERGIZED;
Index: firmware/App/Controllers/Valves.h
===================================================================
diff -u -r54f45c387430e440ab4607451fc84dea61f273f1 -r379f78f1fad668d741b3ccf1e78c69f3fccc45b5
--- firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 54f45c387430e440ab4607451fc84dea61f273f1)
+++ firmware/App/Controllers/Valves.h	(.../Valves.h)	(revision 379f78f1fad668d741b3ccf1e78c69f3fccc45b5)
@@ -33,13 +33,17 @@
 /// Enumeration of available valve state names per valve type (from SA and DG SRS documents).
 typedef enum ValveStateNames
 {
-    VALVE_STATE_OPEN = 0,       ///< Open valve state, used only for VPi, VBf, and VSP
-    VALVE_STATE_CLOSED,         ///< Closed valve state, used only for VPi, VBf, and VSP
-    VALVE_STATE_OPEN_C_TO_NO,   ///< Open Common to Normally Open valve state, used only for VPd
-    VALVE_STATE_DRAIN_C_TO_NC,  ///< Drain Common to Normally Closed valve state, used only for VPd
+    VALVE_STATE_OPEN = 0,       ///< Open valve state, used only for VPi, VBf, VRD1, VRD2, and VSP
+    VALVE_STATE_CLOSED,         ///< Closed valve state, used only for VPi, VBf, VRD1, VRD2, and VSP
+#ifndef V_2_SYSTEM
+    VALVE_STATE_OPEN_C_TO_NC,   ///< Open Common to Normally Closed valve state, used only for VPd
+#else
+    VALVE_STATE_OPEN_C_TO_NO,   ///< Open Common to Normally Open valve state, used only for VPd
+    VALVE_STATE_DRAIN_C_TO_NC,  ///< Drain Common to Normally Closed valve state, used only for VPd
+#endif
     VALVE_STATE_NOFILL_C_TO_NO, ///< No Fill Common to Normally Open valve state, used only for VPo
     VALVE_STATE_FILL_C_TO_NC,   ///< Fill Common to Normally Closed valve state, used only for VPo
-    VALVE_STATE_DRAIN_C_TO_NO,  ///< Drain Common to Normally Open valve state, used only for VDr and VRc
+    VALVE_STATE_DRAIN_C_TO_NO,  ///< Drain Common to Normally Open valve state, used only for VDr and VRc. It is also used for VPd in V3
     VALVE_STATE_RECIRC_C_TO_NC, ///< Recirculate Common to Normally Closed valve state, used only for VDr and VRc
     VALVE_STATE_R1_C_TO_NO,     ///< Reservoir 1 Common to Normally Open valve state, used only for VRo and VRi
     VALVE_STATE_R1_C_TO_NC,     ///< Reservoir 1 Common to Normally Closed valve state, used only for VRd and VRf
@@ -60,9 +64,11 @@
     VRC,              ///< Valve Recirculate
     VDR,              ///< Valve Drain
     VPI,              ///< Valve Pressure Inlet
-    VSP,              ///< Valve Sampling Port
-    VR1,              ///< Valve Reservoir 1 (spare for now including DG FPGA, as valve is of passive air relief type)
-    VR2,              ///< Valve Reservoir 2 (spare for now including DG FPGA, as valve is of passive air relief type)
+    VSP,              ///< Valve Sampling Port
+#ifndef V_2_SYSTEM
+    VRD1,             ///< Valve Reservoir 1 Drain
+    VRD2,             ///< Valve Reservoir 2 Drain
+#endif
     VPD,              ///< Valve Production Drain
     NUM_OF_VALVES     ///< Number of valves
 } VALVES_T;
Index: firmware/App/DGCommon.h
===================================================================
diff -u -r86eec09ab556fbd970ddcae9dc622727928ee757 -r379f78f1fad668d741b3ccf1e78c69f3fccc45b5
--- firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 86eec09ab556fbd970ddcae9dc622727928ee757)
+++ firmware/App/DGCommon.h	(.../DGCommon.h)	(revision 379f78f1fad668d741b3ccf1e78c69f3fccc45b5)
@@ -49,12 +49,13 @@
     #define IGNORE_DRAIN_PUMP_MONITOR       1
     #define IGNORE_HEATERS_MONITOR          1
     #define IGNORE_RO_PUMP_MONITOR          1
-    #define IGNORE_HEAT_DISINFECT_RSRVR_TIMEOUT 1
+    #define IGNORE_DISINFECT_RSRVR_TIMEOUT  1
     #define DISABLE_RO_RATIO_CHECK          1
     #define DISABLE_COND_SENSOR_CHECK       1
     #define DISABLE_MIXING                  1
     #define DISABLE_WATER_QUALITY_CHECK     1
-    #define DISABLE_RTC_CONFIG 1
+    #define DISABLE_RTC_CONFIG              1
+    #define V_2_SYSTEM                      1
     #include <stdio.h>
     #include <strings.h>
 #endif
Index: firmware/App/Modes/ModeChemicalDisinfect.c
===================================================================
diff -u -r86eec09ab556fbd970ddcae9dc622727928ee757 -r379f78f1fad668d741b3ccf1e78c69f3fccc45b5
--- firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 86eec09ab556fbd970ddcae9dc622727928ee757)
+++ firmware/App/Modes/ModeChemicalDisinfect.c	(.../ModeChemicalDisinfect.c)	(revision 379f78f1fad668d741b3ccf1e78c69f3fccc45b5)
@@ -75,25 +75,17 @@
 
 // R1 to R2 & R2 to R1 chemical disinfect circulation
 #define CHEM_DISINFECT_TARGET_RO_FLOW_LPM        0.9                                                           ///< Chemical disinfect target RO flow rate in L/min. TODO original value was 0.8
-#define CHEM_DISINFECT_MAX_RO_PRESSURE_PSI        30                                                           ///< Chemical disinfect maximum RO pressure in psi.
+#define CHEM_DISINFECT_MAX_RO_PRESSURE_PSI       130                                                           ///< Chemical disinfect maximum RO pressure in psi.
 #define CHEM_DISINFECT_TARGET_DRAIN_PRES_PSI    10.0                                                           ///< Chemical disinfect target drain outlet pressure in psi.
 #define CHEM_DISINFECT_TIME_MS                     ( 5 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Chemical disinfect time for each section in milliseconds.  TODO original time was 10 minutes
 #define CHEM_DISINFECT_START_TEMP_TIMOUT_MS        ( 4 * MIN_PER_HOUR * SEC_PER_MIN * MS_PER_SECOND )          ///< Chemical disinfect reaching to minimum temperature timeout in milliseconds. TODO figure out this timeout
 #define RSRVRS_TARGET_VOL_OUT_TIMEOUT_MS           ( 0.5 * SEC_PER_MIN * MS_PER_SECOND )                       ///< Reservoirs 1 & 2 maximum volume out of range timeout during chemical disinfect. TODO change this to 5 seconds
 #define RSRVRS_MAX_TARGET_VOL_CHANGE_ML        600.0                                                           ///< Reservoirs 1 & 2 maximum allowed volume change when full during chemical disinfect. TODO original value is 100 mL
+#define POST_CHEM_DISINFECT_WAIT_TIME_MS           ( 1 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Chemical disinfect final wait time before flushing the system in milliseconds.
 
 // Fill and heat up
 #define CHEM_DISINFECT_TARGET_TEMPERATURE_C     21.0                                                           ///< Chemical disinfect target water temperature in C.
 
-// R1 to R2 & R2 to R1 chemical disinfect circulation
-#define CHEM_DISINFECT_TARGET_RO_FLOW_LPM        0.9                                                           ///< Chemical disinfect target RO flow rate in L/min.
-#define CHEM_DISINFECT_MAX_RO_PRESSURE_PSI       130                                                           ///< Chemical disinfect maximum RO pressure in psi.
-#define CHEM_DISINFECT_TARGET_DRAIN_PRES_PSI    10.0                                                           ///< Chemical disinfect target drain outlet pressure in psi.
-#define CHEM_DISINFECT_TIME_MS                     ( 36 * SEC_PER_MIN * MS_PER_SECOND )                        ///< Chemical disinfect time for each section in milliseconds.  TODO original time is 36 minutes
-#define RSRVRS_TARGET_VOL_OUT_TIMEOUT_MS           ( 0.5 * SEC_PER_MIN * MS_PER_SECOND )                       ///< Reservoirs 1 & 2 maximum volume out of range timeout during chemical disinfect. TODO change this to 5 seconds
-#define RSRVRS_MAX_TARGET_VOL_CHANGE_ML        600.0                                                           ///< Reservoirs 1 & 2 maximum allowed volume change when full during chemical disinfect. TODO original value is 100 mL
-#define POST_CHEM_DISINFECT_WAIT_TIME_MS           ( 1 * SEC_PER_MIN * MS_PER_SECOND )                         ///< Chemical disinfect final wait time before flushing the system in milliseconds.
-
 /// Cancellation paths
 typedef enum Cancellation_modes
 {
@@ -107,10 +99,11 @@
 /// Chemical disinfect status
 typedef enum Chemical_disinfect_status
 {
-    CHEMICAL_DISINFECT_IN_PROGRESS = 0,                                                                        ///< Chemical disinfect in progress.
-    CHEMICAL_DISINFECT_RSRVRS_LEAK_TIMEOUT,                                                                    ///< Chemical disinfect reservoirs leak timeout.
-    CHEMICAL_DISINFECT_COMPLETE,                                                                               ///< Chemical disinfect complete.
-    NUM_OF_CHEMICAL_DISINFECT_STATUS                                                                           ///< Number of chemical disinfect status.
+    CHEM_DISINFECT_IN_PROGRESS = 0,                                                                            ///< Chemical disinfect in progress.
+    CHEM_DISINFECT_RSRVRS_LEAK_TIMEOUT,                                                                        ///< Chemical disinfect reservoirs leak timeout.
+    CHEM_DISINFECT_HEAT_UP_TIMEOUT,                                                                            ///< Chemical disinfect heat up timeout.
+    CHEM_DISINFECT_COMPLETE,                                                                                   ///< Chemical disinfect complete.
+    NUM_OF_CHEM_DISINFECT_STATUS                                                                               ///< Number of chemical disinfect status.
 } CHEM_DISINFECT_STATUS_T;
 
 // ********** private data **********
@@ -135,7 +128,6 @@
 static CANCELLATION_MODE_T cancellationMode = CANCELLATION_MODE_NONE;                                          ///< Cancellation mode.
 static U32 rsrvrFillStableTimeCounter = 0;                                                                     ///< Reservoirs fill stable time counter.
 static ALARM_ID_T alarmDetectedPendingTrigger;                                                                 ///< Chemical disinfect alarm to raise.
-static BOOL isDrainPumpInMixDrainOn = FALSE;                                                                   ///< Flag to show the drain pump is on during mix drain.
 
 // ********** private function prototypes **********
 
@@ -153,11 +145,11 @@
 static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectFillR2WithDisinfectantState( void );
 static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectDisinfectR2ToR1State( void );
 static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectCoolDownHeatersState( void );
-static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectCoolDownROFilterState( void );
-static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectMixDrainR1State( void );
-static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectMixDrainR2State( void );
+static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectDisinfectantDrainR1State( void );
+static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectDisinfectantDrainR2State( void );
 static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectRinseR1ToR2State( void );
 static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectRinseR2ToR1AndDrainR1State( void );
+static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectRinseR1ToR2AndDrainR2State( void );
 static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectRinseCirculationState( void );
 static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectCancelModeBasicPathState( void );
 static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectCancelModeWaterPathState( void );
@@ -178,7 +170,7 @@
  * stateTrialCounter, areTempSensorsInRange, rsrvr1Status, rsrvr2Status,
  * R1ChemDisinfectVol, R2ChemDisinfectVol, overallChemDisinfectTimer,
  * cancellationMode, rsrvrFillStableTimeCounter, prevChemDisinfectState
- * isPartialDisinfectInProgress, isDrainPumpOnInMixDrain
+ * isPartialDisinfectInProgress
  * @return none
  *************************************************************************/
 void initChemicalDisinfectMode( void )
@@ -197,7 +189,6 @@
     cancellationMode             = CANCELLATION_MODE_NONE;
     rsrvrFillStableTimeCounter   = 0;
     isPartialDisinfectInProgress = FALSE;
-    isDrainPumpInMixDrainOn      = FALSE;
 }
 
 /*********************************************************************//**
@@ -272,36 +263,51 @@
             break;
 
         case DG_CHEM_DISINFECT_STATE_FILL_R2_WITH_DISINFECTANT:
+            chemDisinfectState = handleChemicalDisinfectFillR2WithDisinfectantState();
             break;
 
         case DG_CHEM_DISINFECT_STATE_DISINFECT_R2_TO_R1:
+            chemDisinfectState = handleChemicalDisinfectDisinfectR2ToR1State();
             break;
 
+        case DG_CHEM_DISINFECT_STATE_COOL_DOWN_HEATERS:
+            chemDisinfectState = handleChemicalDisinfectCoolDownHeatersState();
+            break;
+
         case DG_CHEM_DISINFECT_STATE_DISINFECTANT_DRAIN_R1:
+            chemDisinfectState = handleChemicalDisinfectDisinfectantDrainR1State();
             break;
 
         case DG_CHEM_DISINFECT_STATE_DISINFECTANT_DRAIN_R2:
+            chemDisinfectState = handleChemicalDisinfectDisinfectantDrainR2State();
             break;
 
         case DG_CHEM_DISINFECT_STATE_RINSE_R1_TO_R2:
+            chemDisinfectState = handleChemicalDisinfectRinseR1ToR2State();
             break;
 
         case DG_CHEM_DISINFECT_STATE_RINSE_R2_TO_R1_AND_DRAIN_R1:
+            chemDisinfectState = handleChemicalDisinfectRinseR2ToR1AndDrainR1State();
             break;
 
         case DG_CHEM_DISINFECT_STATE_RINSE_R1_TO_R2_AND_DRAIN_R2:
+            chemDisinfectState = handleChemicalDisinfectRinseR1ToR2AndDrainR2State();
             break;
 
         case DG_CHEM_DISINFECT_STATE_RINSE_CIRCULATION:
+            chemDisinfectState = handleChemicalDisinfectRinseCirculationState();
             break;
 
         case DG_CHEM_DISINFECT_STATE_CANCEL_BASIC_PATH:
+            chemDisinfectState = handleChemicalDisinfectCancelModeBasicPathState();
             break;
 
         case DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH:
+            chemDisinfectState = handleChemicalDisinfectCancelModeWaterPathState();
             break;
 
         case DG_CHEM_DISINFECT_STATE_COMPLETE:
+            chemDisinfectState = handleChemicalDisinfectCompleteState();
             break;
 
         default:
@@ -372,7 +378,7 @@
  *************************************************************************/
 static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectStartState( void )
 {
-    DG_CHEM_DISINFECT_STATE_T state = DG_CHEM_DISINFECT_STATE_START;
+    DG_CHEM_DISINFECT_STATE_T state = DG_CHEM_DISINFECT_STATE_DRAIN_R1;
 
     // Start overall chemical disinfect timer
     overallChemDisinfectTimer = getMSTimerCount();
@@ -402,8 +408,13 @@
         // 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 );
 
         rsrvrFillStableTimeCounter = 0;
@@ -442,7 +453,13 @@
 
             // Set the valves to flush the recirculation line
             setValveState( VPI, VALVE_STATE_OPEN );
+#ifndef V_2_SYSTEM
+            setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
+            // Done with draining R1
+            setValveState( VRD1, VALVE_STATE_CLOSED );
+#else
             setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
+#endif
             setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
             setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
             setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
@@ -464,9 +481,13 @@
             // Request a tare for reservoir 2
             tareReservoir();
 
+#ifndef V_2_SYSTEM
+            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
             state = DG_CHEM_DISINFECT_STATE_DRAIN_R2;
         }
 
@@ -505,13 +526,21 @@
     {
         if ( TRUE == isThisLastDrain )
         {
+#ifndef V_2_SYSTEM
+            setValveState( VRD1, VALVE_STATE_OPEN );
+            setValveState( VRD2, VALVE_STATE_CLOSED );
+#else
             setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
+#endif
             rsrvr1Status = DG_RESERVOIR_ABOVE_TARGET;
             state = DG_CHEM_DISINFECT_STATE_DRAIN_R1;
         }
         else
         {
             signalDrainPumpHardStop();
+#ifndef V_2_SYSTEM
+            setValveState( VRD2, VALVE_STATE_CLOSED );
+#endif
             setValveState( VPI, VALVE_STATE_OPEN );
             stateTrialCounter = 0;
             stateTimer = getMSTimerCount();
@@ -551,11 +580,15 @@
         if ( ( getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER ) > MIN_INLET_TEMPERATURE_C ) &&
              ( getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR )  <=  MAX_INLET_CONDUCTIVITY_US_PER_CM ) )
         {
+#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_FLUSH_FILL_FLOW_RATE_LPM, MAX_RO_PUMP_FLUSH_FILL_PRESSURE_PSI );
             stateTimer = getMSTimerCount();
             stateTrialCounter = 0;
-            state = DG_CHEM_DISINFECT_STATE_RINSE_CIRCULATION;
+            state = DG_CHEM_DISINFECT_STATE_FLUSH_CIRCULATION;
         }
         // If the number of failures have not exceeded the limit, try again.
         else if ( stateTrialCounter < MAX_ALLOWED_STATE_TRIALS )
@@ -699,7 +732,11 @@
             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 );
             stateTimer = getMSTimerCount();
 
@@ -790,10 +827,16 @@
 
             // Set the valves to drain R2 and no fill
             setValveState( VPI, VALVE_STATE_CLOSED );
+#ifndef V_2_SYSTEM
+            setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
+            setValveState( VRD1, VALVE_STATE_CLOSED );
+            setValveState( VRD2, VALVE_STATE_OPEN );
+#else
             setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
+            setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
+#endif
             setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
             setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
-            setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
             setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM );
             // Start the timer for drain timeout
             stateTimer = getMSTimerCount();
@@ -838,7 +881,11 @@
     }
     else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
     {
+#ifndef V_2_SYSTEM
+        setValveState( VRD1, VALVE_STATE_OPEN );
+#else
         setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
+#endif
         // Start the timer for drain timeout
         stateTimer = getMSTimerCount();
         rsrvr1Status = DG_RESERVOIR_ABOVE_TARGET;
@@ -881,12 +928,18 @@
 
         // Prepare for filling the reservoirs and heating the water
         setValveState( VPI, VALVE_STATE_OPEN );
+#ifndef V_2_SYSTEM
+        setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
+        setValveState( VRD1, VALVE_STATE_CLOSED );
+        setValveState( VRD2, VALVE_STATE_CLOSED );
+#else
         setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
+        setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
+#endif
         setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
         setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
         setValveState( VRI, VALVE_STATE_R2_C_TO_NC );
         setValveState( VRF, VALVE_STATE_R1_C_TO_NC );
-        setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
 
         // Turn on the RO pump
         setROPumpTargetFlowRate( RO_PUMP_TARGET_FLUSH_FILL_FLOW_RATE_LPM, MAX_RO_PUMP_FLUSH_FILL_PRESSURE_PSI );
@@ -944,7 +997,12 @@
             // Set the valves to drain R2 and no fill
             setValveState( VPI, VALVE_STATE_CLOSED );
             setValveState( VBF, VALVE_STATE_OPEN );
+#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
             setValveState( VDR, VALVE_STATE_RECIRC_C_TO_NC );
             setValveState( VRC, VALVE_STATE_RECIRC_C_TO_NC );
 
@@ -996,21 +1054,25 @@
 
     switch ( status )
     {
-        case CHEMICAL_DISINFECT_IN_PROGRESS:
-        case CHEMICAL_DISINFECT_RSRVRS_LEAK_TIMEOUT:
+        case CHEM_DISINFECT_RSRVRS_LEAK_TIMEOUT:
+        case CHEM_DISINFECT_HEAT_UP_TIMEOUT:
             state = DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH;
             break;
 
-        case CHEMICAL_DISINFECT_COMPLETE:
-
+        case CHEM_DISINFECT_COMPLETE:
             //TODO turn off CP1 and CP2
             // Set the valves to transfer hot water from R1 to R2 and fill up R2.
             setValveState( VRO, VALVE_STATE_R2_C_TO_NC );
+#ifndef V_2_SYSTEM
+            setValveState( VRD1, VALVE_STATE_OPEN );
+            setValveState( VRD2, VALVE_STATE_CLOSED );
+#else
             setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
+#endif
             setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
             setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
             // Although there is fluid in both reservoirs, but they are set to empty
-            // to begin the transition of hot water from R1 to R2.
+            // to begin the transition of disinfectant water from R1 to R2.
             rsrvr2Status = DG_RESERVOIR_BELOW_TARGET;
             rsrvr1Status = DG_RESERVOIR_BELOW_TARGET;
             stateTimer = getMSTimerCount();
@@ -1025,17 +1087,418 @@
     return state;
 }
 
+/*********************************************************************//**
+ * @brief
+ * The handleChemicalDisinfectFillR2WithDisinfectantState function
+ * handles fill R2 with water state. The state transfers disinfectant from
+ * reservoir 1 to reservoir 2 until disinfectant overflows from reservoir 2
+ * to reservoir 1.
+ * If the fill times out, it transitions to water cancellation state,
+ * otherwise, it transitions to the next state.
+ * @details Inputs: rsrvr1Status, rsrvr2Status
+ * @details Outputs: rsrvr1Status, rsrvr2Status, R1ChemDisinfectVol,
+ * R2ChemDisinfectVol, prevChemDisinfectState
+ * @return next state of the chemical disinfect state machine
+ *************************************************************************/
 static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectFillR2WithDisinfectantState( void )
 {
+    DG_CHEM_DISINFECT_STATE_T state = DG_CHEM_DISINFECT_STATE_FILL_R2_WITH_DISINFECTANT;
 
+    // First reservoir 1 must be partially full
+    if ( DG_RESERVOIR_BELOW_TARGET == rsrvr1Status )
+    {
+        rsrvr1Status = getRsrvrFillStatus( DG_RESERVOIR_1, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_500ML_FILL_UP_TIMEOUT_MS );
+    }
+    else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
+    {
+        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_FULL_VOL_ML, RSRVRS_FILL_UP_TIMEOUT_MS );
+
+        if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
+        {
+            // Get the current volumes to be monitored during R2 to R1 chemical disinfect state
+            R1ChemDisinfectVol = getLoadCellLargeFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY );
+            R2ChemDisinfectVol = getLoadCellLargeFilteredWeight( LOAD_CELL_RESERVOIR_2_PRIMARY );
+
+            //TODO turn on CP1 and CP2
+
+            state = DG_CHEM_DISINFECT_STATE_DISINFECT_R2_TO_R1;
+        }
+#ifdef IGNORE_DISINFECT_RSRVR_TIMEOUT
+        else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr2Status )
+        {
+            prevChemDisinfectState = state;
+            state = DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH;
+        }
+#endif
+    }
+#ifdef IGNORE_DISINFECT_RSRVR_TIMEOUT
+    else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr1Status )
+    {
+        prevChemDisinfectState = state;
+        state = DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH;
+    }
+#endif
+
+    return state;
 }
+
+/*********************************************************************//**
+ * @brief
+ * The handleChemicalDisinfectDisinfectR2ToR1State function handles the
+ * chemical disinfect R2 to R1 state. If the reservoirs leak or it cannot
+ * reach to temperature within a certain period of time, it transitions to
+ * water cancellation state. If heat disinfect reservoir 1 to reservoir 2 is
+ * completed, it transitions to the next state.
+ * @details Inputs: stateTimer, rsrvr1Status
+ * @details Outputs: stateTimer, rsrvr1Status
+ * @return next state of the heat disinfect state machine
+ *************************************************************************/
 static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectDisinfectR2ToR1State( void )
 {
+    DG_CHEM_DISINFECT_STATE_T state = DG_CHEM_DISINFECT_STATE_DISINFECT_R2_TO_R1;
+    CHEM_DISINFECT_STATUS_T status  = getChemicalDisinfectStatus();
 
+    switch ( status )
+    {
+        case CHEM_DISINFECT_RSRVRS_LEAK_TIMEOUT:
+        case CHEM_DISINFECT_HEAT_UP_TIMEOUT:
+            state = DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH;
+            break;
+
+        case CHEM_DISINFECT_COMPLETE:
+            // Turn off the heaters
+            // TODO turn off CP1 and CP2
+            stopPrimaryHeater();
+            stateTimer = getMSTimerCount();
+            state = DG_CHEM_DISINFECT_STATE_COOL_DOWN_HEATERS;
+            break;
+    }
+
+    return state;
 }
 
 /*********************************************************************//**
  * @brief
+ * The handleChemicalDisinfectCoolDownHeatersState function handles the
+ * chemical disinfect cool down heaters state. The state continues running
+ * the fluid while the heaters are off for a certain period of time.
+ * @details Inputs: stateTimer
+ * @details Outputs: stateTimer
+ * @return next state of the heat disinfect state machine
+ *************************************************************************/
+static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectCoolDownHeatersState( void )
+{
+    DG_CHEM_DISINFECT_STATE_T state = DG_CHEM_DISINFECT_STATE_COOL_DOWN_HEATERS;
+
+    if ( TRUE == didTimeout( stateTimer, POST_CHEM_DISINFECT_WAIT_TIME_MS ) )
+    {
+        // Stop the drain pump and the RO pump to exit the closed loop
+        signalDrainPumpHardStop();
+        signalROPumpHardStop();
+
+        // De-energize all the valves that are not in the path anymore
+        // and wait for the RO membrane to be cooled down.
+        setValveState( VPI, VALVE_STATE_CLOSED );
+        setValveState( VBF, VALVE_STATE_CLOSED );
+#ifndef V_2_SYSTEM
+        setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
+        setValveState( VRD1, VALVE_STATE_OPEN );
+#else
+        setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NC );
+        setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
+#endif
+        setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM );
+        stateTimer = getMSTimerCount();
+        state = DG_CHEM_DISINFECT_STATE_DISINFECTANT_DRAIN_R1;
+    }
+
+    return state;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleChemicalDisinfectDisinfectantDrainR1State function handles
+ * the chemical disinfect disinfectant drain R1 state. The state drains
+ * reservoir 1 and if it times out, it transitions to basic cancellation
+ * state. Otherwise, it transitions to the next state.
+ * @details Inputs: rsrvr1Status, rsrvr2Status
+ * @details Outputs: stateTimer, rsrvr1Status, rsrvr2Status,
+ * prevChemDisinfectState
+ * @return next state of the chemical disinfect state machine
+ *************************************************************************/
+static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectDisinfectantDrainR1State( void )
+{
+    DG_CHEM_DISINFECT_STATE_T state = DG_CHEM_DISINFECT_STATE_DISINFECTANT_DRAIN_R1;
+
+    if ( DG_RESERVOIR_ABOVE_TARGET == rsrvr1Status )
+    {
+        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_INITIAL_DRAIN_TIME_OUT_MS );
+    }
+    else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
+    {
+#ifndef V_2_SYSTEM
+        // Done with draining reservoir 1
+        setValveState( VRD1, VALVE_STATE_CLOSED );
+        // Set the drain valve to reservoir 2
+        setValveState( VRD2, VALVE_STATE_OPEN );
+#else
+        // Set the drain valve to reservoir 2
+        setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
+#endif
+        rsrvr2Status = DG_RESERVOIR_ABOVE_TARGET;
+        stateTimer = getMSTimerCount();
+        state = DG_CHEM_DISINFECT_STATE_DISINFECTANT_DRAIN_R2;
+    }
+    else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr1Status )
+    {
+        prevChemDisinfectState = state;
+        state = DG_CHEM_DISINFECT_STATE_CANCEL_BASIC_PATH;
+    }
+
+    return state;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleChemicalDisinfectDisinfectantDrainR1State function handles
+ * the chemical disinfect disinfectant drain R2 state. The state drains
+ * reservoir 1 and if it times out, it transitions to basic cancellation
+ * state. Otherwise, it transitions to the next state.
+ * @details Inputs: rsrvr1Status, rsrvr2Status
+ * @details Outputs: stateTimer, rsrvr1Status, rsrvr2Status,
+ * prevChemDisinfectState
+ * @return next state of the chemical disinfect state machine
+ *************************************************************************/
+static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectDisinfectantDrainR2State( void )
+{
+    DG_CHEM_DISINFECT_STATE_T state = DG_CHEM_DISINFECT_STATE_DISINFECTANT_DRAIN_R2;
+
+    if ( DG_RESERVOIR_ABOVE_TARGET == rsrvr2Status )
+    {
+        rsrvr2Status = getRsrvrDrainStatus( DG_RESERVOIR_2, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_INITIAL_DRAIN_TIME_OUT_MS );
+    }
+    else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
+    {
+        // Done with draining the reservoirs
+        signalDrainPumpHardStop();
+
+        // Set the valves to fill up R1 and overflow to R2
+        setValveState( VPI, VALVE_STATE_OPEN );
+#ifndef V_2_SYSTEM
+        setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
+        // Done with draining reservoir 2
+        setValveState( VRD2, VALVE_STATE_CLOSED );
+#else
+        setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
+#endif
+        setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
+        setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
+        setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
+        setValveState( VRF, VALVE_STATE_R1_C_TO_NC );
+        setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
+        setValveState( VRI, VALVE_STATE_R2_C_TO_NC );
+        setROPumpTargetFlowRate( RO_PUMP_TARGET_FLUSH_FILL_FLOW_RATE_LPM, MAX_RO_PUMP_FLUSH_FILL_PRESSURE_PSI );
+
+        rsrvr1Status = DG_RESERVOIR_BELOW_TARGET;
+        rsrvr2Status = DG_RESERVOIR_BELOW_TARGET;
+
+        stateTimer = getMSTimerCount();
+        state = DG_CHEM_DISINFECT_STATE_RINSE_R1_TO_R2;
+    }
+    else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr2Status )
+    {
+        prevChemDisinfectState = state;
+        state = DG_CHEM_DISINFECT_STATE_CANCEL_BASIC_PATH;
+    }
+
+    return state;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The handleChemicalDisinfectRinseR1ToR2State function handles the chemical
+ * disinfect rinse R1 to R2 state. The state rinses reservoir 1 to reservoir
+ * 2. If the rinse process times out, it transitions to water cancellation
+ * state, otherwise, it transitions to the next state.
+ * @details Inputs: rsrvr1Status, rsrvr2Status
+ * @details Outputs: stateTimer, rsrvr1Status, rsrvr2Status,
+ * prevChemDisinfectState, alarmDetectedPendingTrigger
+ * @return next state of the chemical disinfect state machine
+ *************************************************************************/
+static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectRinseR1ToR2State( void )
+{
+    DG_CHEM_DISINFECT_STATE_T state = DG_CHEM_DISINFECT_STATE_RINSE_R1_TO_R2;
+
+    if ( DG_RESERVOIR_BELOW_TARGET == rsrvr1Status )
+    {
+        rsrvr1Status = getRsrvrFillStatus( DG_RESERVOIR_1, RSRVRS_FULL_VOL_ML, RSRVRS_FILL_UP_TIMEOUT_MS );
+
+        // Keep monitoring the status of reservoir 2 at the same time
+        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_500ML_FILL_UP_TIMEOUT_MS );
+        // Reservoir 2 cannot be filled before reservoir 1 is filled and is overflowing to reservoir 2. If reservoir 2 has already
+        // reached to target volume, it means reservoir 1's load cell might be reading incorrect values. This situation might continue
+        // until reservoir 2 is filled up and the tubing might expand or leak.
+        if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
+        {
+            prevChemDisinfectState = state;
+            alarmDetectedPendingTrigger = ALARM_ID_DG_INVALID_LOAD_CELL_VALUE;
+            state = DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH;
+        }
+    }
+    else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
+    {
+        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_500ML_FILL_UP_TIMEOUT_MS );
+
+        if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
+        {
+            // Set the valves to rinse R2 to R1 and drain R1
+            setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
+            setValveState( VRO, VALVE_STATE_R2_C_TO_NC );
+#ifndef V_2_SYSTEM
+            setValveState( VRD1, VALVE_STATE_R1_C_TO_NC );
+#else
+            setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
+#endif
+            setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
+            setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM );
+
+            rsrvr1Status = DG_RESERVOIR_ABOVE_TARGET;
+            rsrvr2Status = DG_RESERVOIR_BELOW_TARGET;
+            stateTimer = getMSTimerCount();
+            state = DG_CHEM_DISINFECT_STATE_RINSE_R2_TO_R1_AND_DRAIN_R1;
+        }
+        else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr2Status )
+        {
+            prevChemDisinfectState = state;
+            state = DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH;
+        }
+    }
+    else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr1Status )
+    {
+        prevChemDisinfectState = state;
+        state = DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH;
+    }
+
+    return state;
+}
+
+
+static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectRinseR2ToR1AndDrainR1State( void )
+{
+    DG_CHEM_DISINFECT_STATE_T state = DG_CHEM_DISINFECT_STATE_RINSE_R2_TO_R1_AND_DRAIN_R1;
+
+    if ( DG_RESERVOIR_ABOVE_TARGET == rsrvr1Status )
+    {
+        rsrvr1Status = getRsrvrDrainStatus( DG_RESERVOIR_1, DRAIN_WEIGHT_UNCHANGE_TIMEOUT, RSRVRS_INITIAL_DRAIN_TIME_OUT_MS );
+    }
+    else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
+    {
+        // Done with draining R1
+        signalDrainPumpHardStop();
+#ifndef V_2_SYSTEM
+            setValveState( VRD1, VALVE_STATE_CLOSED );
+#endif
+    }
+    else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr1Status )
+    {
+        prevChemDisinfectState = state;
+        state = DG_CHEM_DISINFECT_STATE_CANCEL_BASIC_PATH;
+    }
+
+    // First reservoir 2 must be completely full
+    if ( DG_RESERVOIR_BELOW_TARGET == rsrvr2Status )
+    {
+        rsrvr2Status = getRsrvrFillStatus( DG_RESERVOIR_2, RSRVRS_FULL_VOL_ML, RSRVRS_FILL_UP_TIMEOUT_MS );
+
+        U32 drainPumpRPM = getTargetDrainPumpRPM();
+        // Keep monitoring the status of reservoir 1 as the same time
+        F32 volume = getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY );
+        // Reservoir 1 cannot be filled before reservoir 2 is filled and is overflowing to reservoir 1. If reservoir 1 has already
+        // reached to target volume, it means reservoir 2's load cell might be reading incorrect values. This situation might continue
+        // until reservoir 1 is filled up and the tubing might expand or leak.
+        // Before checking whether reservoir 1 is filled pre-maturely, we have to make sure reservoir 1 is drained completely to make
+        // sure the extra volume that is read is not because of previous water that is being drained currently and it is above 500 mL
+        if ( ( volume > RSRVRS_PARTIAL_FILL_VOL_ML ) && ( 0 == drainPumpRPM ) )
+        {
+            prevChemDisinfectState = state;
+            alarmDetectedPendingTrigger = ALARM_ID_DG_INVALID_LOAD_CELL_VALUE;
+            state = DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH;
+        }
+    }
+    // Once reservoir 2 is completely full, monitor reservoir 1
+    else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
+    {
+        rsrvr1Status = getRsrvrFillStatus( DG_RESERVOIR_1, RSRVRS_PARTIAL_FILL_VOL_ML, RSRVRS_500ML_FILL_UP_TIMEOUT_MS );
+
+        if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
+        {
+            // Done with filling, turn off the RO pump
+            signalROPumpHardStop();
+
+            // De-energize all the valves and set the VDr to drain R2
+            setValveState( VPI, VALVE_STATE_CLOSED );
+#ifndef V_2_SYSTEM
+            setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
+#else
+            setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
+#endif
+            setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
+            setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
+#ifndef V_2_SYSTEM
+            setValveState( VRD2, VALVE_STATE_OPEN );
+#else
+            setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
+#endif
+            setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
+            setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
+
+            // Turn on the drain pump to drain R2
+            setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM );
+
+            // This is the last drain of heat disinfect cycle
+            isThisLastDrain = TRUE;
+            stateTimer = getMSTimerCount();
+            // Set the reservoir status
+            rsrvr2Status = DG_RESERVOIR_ABOVE_TARGET;
+            state = DG_CHEM_DISINFECT_STATE_RINSE_R1_TO_R2_AND_DRAIN_R2;
+        }
+        else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr1Status )
+        {
+            prevChemDisinfectState = state;
+            state = DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH;
+        }
+    }
+    else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr2Status )
+    {
+        prevChemDisinfectState = state;
+        state = DG_CHEM_DISINFECT_STATE_CANCEL_WATER_PATH;
+    }
+
+    return state;
+}
+static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectRinseR1ToR2AndDrainR2State( void )
+{
+
+}
+static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectRinseCirculationState( void )
+{
+
+}
+static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectCancelModeBasicPathState( void )
+{
+
+}
+static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectCancelModeWaterPathState( void )
+{
+
+}
+static DG_CHEM_DISINFECT_STATE_T handleChemicalDisinfectCompleteState( void )
+{
+
+}
+
+/*********************************************************************//**
+ * @brief
  * The failChemicalDisinfect function sets the alarm that failed the
  * chemical disinfect mode.
  * @details Inputs: alarmDetectedPendingTrigger, prevChemDisinfectState
@@ -1066,7 +1529,7 @@
 
     if ( r == DG_RESERVOIR_1 )
     {
-        volume = getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_1_BACKUP ); //TODO change back to primary
+        volume = getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY );
     }
     else if ( r == DG_RESERVOIR_2 )
     {
@@ -1149,8 +1612,10 @@
  *************************************************************************/
 static CHEM_DISINFECT_STATUS_T getChemicalDisinfectStatus( void )
 {
-    CHEM_DISINFECT_STATUS_T status = CHEMICAL_DISINFECT_IN_PROGRESS;
+    CHEM_DISINFECT_STATUS_T status = CHEM_DISINFECT_IN_PROGRESS;
 
+    F32 ThdTemp = getTemperatureValue( TEMPSENSORS_OUTLET_REDUNDANT ); //TODO change this to actual THd sensor later
+
     BOOL isR1OutOfRange = fabs( getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_1_PRIMARY ) - R1ChemDisinfectVol ) > RSRVRS_MAX_TARGET_VOL_CHANGE_ML;
     BOOL isR2OutOfRange = fabs( getLoadCellSmallFilteredWeight( LOAD_CELL_RESERVOIR_2_PRIMARY ) - R2ChemDisinfectVol ) > RSRVRS_MAX_TARGET_VOL_CHANGE_ML;
 
@@ -1168,7 +1633,7 @@
         {
             areRsrvrsLeaking = FALSE;
             alarmDetectedPendingTrigger = ALARM_ID_DG_RESERVOIR_LEAK_TIMEOUT;
-            status = CHEMICAL_DISINFECT_RSRVRS_LEAK_TIMEOUT;
+            status = CHEM_DISINFECT_RSRVRS_LEAK_TIMEOUT;
         }
     }
     // Reservoirs are in range
@@ -1177,35 +1642,35 @@
         areRsrvrsLeaking = FALSE;
     }
 
-    // If the coldest spot which is TPm is less than minimum heat disinfect temperature,
-    // reset the heat disinfect timers and check whether heating up has timed out
-    /*if ( ThdTemp < HEAT_DISINFECT_START_TEMPERATURE_C )
+    // If the coldest spot which is THd is less than minimum chemical disinfect temperature,
+    // reset the chemical disinfect timers and check whether heating up has timed out
+    if ( ThdTemp < CHEM_DISINFECT_TARGET_TEMPERATURE_C )
     {
         // Keep reseting the disinfect timer so the elapsed time is always 0 until disinfect truly starts
-        heatDisinfectTimer           = getMSTimerCount();
+        chemDisinfectTimer           = getMSTimerCount();
         isPartialDisinfectInProgress = FALSE;
 
-        if ( TRUE == didTimeout( stateTimer, HEAT_DISINFECT_START_TEMP_TIMOUT_MS ) )
+        if ( TRUE == didTimeout( stateTimer, CHEM_DISINFECT_START_TEMP_TIMOUT_MS ) )
         {
-            // Heating up to minimum temperature for heat disinfect failed
-            alarmDetectedPendingTrigger  = ALARM_ID_DG_HEAT_DISINFECT_TARGET_TEMP_TIMEOUT;
-            status = HEAT_DISINFECT_HEAT_UP_TIMEOUT;
+            // Heating up to minimum temperature for chemical disinfect failed
+            alarmDetectedPendingTrigger  = ALARM_ID_DG_CHEM_DISINFECT_TARGET_TEMP_TIMEOUT;
+            status = CHEM_DISINFECT_HEAT_UP_TIMEOUT;
         }
     }
-    else if ( isPartialDisinfectInProgress != TRUE && ThdTemp > HEAT_DISINFECT_START_TEMPERATURE_C )
+    else if ( ( isPartialDisinfectInProgress != TRUE ) && ( ThdTemp > CHEM_DISINFECT_TARGET_TEMPERATURE_C ) )
     {
         // The temperature of the coldest spot is in range to start the disinfect timer
-        heatDisinfectTimer           = getMSTimerCount();
+        chemDisinfectTimer           = getMSTimerCount();
         isPartialDisinfectInProgress = TRUE;
     }
 
-    // If heat disinfect temperature has been reached, check if this stage of heat disinfect is done
-    if ( ( TRUE == isPartialDisinfectInProgress ) && ( TRUE == didTimeout( heatDisinfectTimer, HEAT_DISINFECT_TIME_MS ) ) )
+    // If chemical disinfect temperature has been reached, check if this stage of chemical disinfect is done
+    if ( ( TRUE == isPartialDisinfectInProgress ) && ( TRUE == didTimeout( chemDisinfectTimer, CHEM_DISINFECT_TIME_MS ) ) )
     {
-        // Done with this stage of heat disnfect. Reset the variables
-        status = HEAT_DISINFECT_COMPLETE;
+        // Done with this stage of chemical disnfect. Reset the variables
+        status = CHEM_DISINFECT_COMPLETE;
         isPartialDisinfectInProgress = FALSE;
-    }*/
+    }
 
     return status;
 }
Index: firmware/App/Modes/ModeDrain.c
===================================================================
diff -u -rebbb1f85550a1f9b8f946655f7b2b63f76fbf67d -r379f78f1fad668d741b3ccf1e78c69f3fccc45b5
--- firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision ebbb1f85550a1f9b8f946655f7b2b63f76fbf67d)
+++ firmware/App/Modes/ModeDrain.c	(.../ModeDrain.c)	(revision 379f78f1fad668d741b3ccf1e78c69f3fccc45b5)
@@ -71,8 +71,22 @@
     // re-initialize each time we transition to drain mode
     initDrainMode();
 
+#ifndef V_2_SYSTEM
+    DG_RESERVOIR_ID_T inactiveReservoir = getInactiveReservoir();
+
+    if ( DG_RESERVOIR_1 == inactiveReservoir )
+    {
+        setValveState( VRD1, VALVE_STATE_OPEN );
+    }
+    else if ( DG_RESERVOIR_2 == inactiveReservoir )
+    {
+        setValveState( VRD2, VALVE_STATE_OPEN );
+    }
+#else
     // set initial actuator states
     setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
+#endif
+
     setDrainPumpTargetRPM( TARGET_DRAIN_PUMP_RPM );
     setROPumpTargetFlowRate( TARGET_RO_FLOW_RATE_L, TARGET_RO_PRESSURE_PSI );
 }
@@ -129,6 +143,17 @@
     {
         setDrainPumpTargetRPM( 0 );
         requestNewOperationMode( DG_MODE_CIRC );
+
+#ifndef V_2_SYSTEM
+        if ( DG_RESERVOIR_1 == inactiveReservoir )
+        {
+            setValveState( VRD1, VALVE_STATE_CLOSED );
+        }
+        else if ( DG_RESERVOIR_2 == inactiveReservoir )
+        {
+            setValveState( VRD2, VALVE_STATE_CLOSED );
+        }
+#endif
     }
 
     return result;
Index: firmware/App/Modes/ModeFault.c
===================================================================
diff -u -rd7926685f2fe3086bab183166119f0965a192a69 -r379f78f1fad668d741b3ccf1e78c69f3fccc45b5
--- firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision d7926685f2fe3086bab183166119f0965a192a69)
+++ firmware/App/Modes/ModeFault.c	(.../ModeFault.c)	(revision 379f78f1fad668d741b3ccf1e78c69f3fccc45b5)
@@ -113,12 +113,22 @@
     setValveState( VPI, VALVE_STATE_CLOSED );
     setValveState( VBF, VALVE_STATE_CLOSED );
     setValveState( VSP, VALVE_STATE_CLOSED );
+#ifndef V_2_SYSTEM
+    setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
+#else
     setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
+#endif
     setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
     setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
     setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
     setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
+
+#ifndef V_2_SYSTEM
+    setValveState( VRD1, VALVE_STATE_CLOSED );
+    setValveState( VRD2, VALVE_STATE_CLOSED );
+#else
     setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
+#endif
     setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
     setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
 
Index: firmware/App/Modes/ModeFlush.c
===================================================================
diff -u -re86af65442a36724461317980814f0868bd8c995 -r379f78f1fad668d741b3ccf1e78c69f3fccc45b5
--- firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision e86af65442a36724461317980814f0868bd8c995)
+++ firmware/App/Modes/ModeFlush.c	(.../ModeFlush.c)	(revision 379f78f1fad668d741b3ccf1e78c69f3fccc45b5)
@@ -298,8 +298,14 @@
     // 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 );
 
     stateTimerStart = getMSTimerCount();
@@ -334,9 +340,17 @@
             tareReservoir();
         }
 
+#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;
@@ -376,15 +390,25 @@
          {
              // 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( 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 );
@@ -416,7 +440,11 @@
 
     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
@@ -529,7 +557,11 @@
             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();
 
@@ -579,6 +611,9 @@
     {
         // 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 )
@@ -615,7 +650,11 @@
         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
             setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM );
 
             stateTimerStart = getMSTimerCount();
@@ -664,7 +703,11 @@
     {
         // 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 );
         setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
@@ -699,7 +742,11 @@
 
     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 );
 
@@ -776,7 +823,12 @@
 
         // 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;
@@ -801,8 +853,13 @@
 
         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 )
@@ -818,6 +875,9 @@
 
         if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
         {
+#ifndef V_2_SYSTEM
+            setValveState( VRD2, VALVE_STATE_CLOSED );
+#endif
             // Done with draining
             signalDrainPumpHardStop();
 
Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -r86eec09ab556fbd970ddcae9dc622727928ee757 -r379f78f1fad668d741b3ccf1e78c69f3fccc45b5
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 86eec09ab556fbd970ddcae9dc622727928ee757)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 379f78f1fad668d741b3ccf1e78c69f3fccc45b5)
@@ -420,8 +420,13 @@
         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 );
 
         rsrvrFillStableTimeCounter = 0;
@@ -460,7 +465,12 @@
 
             // Set the valves to flush the recirculation line
             setValveState( VPI, VALVE_STATE_OPEN );
+#ifndef V_2_SYSTEM
+            setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
+            setValveState( VRD1, VALVE_STATE_CLOSED );
+#else
             setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
+#endif
             setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
             setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
             setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
@@ -480,9 +490,17 @@
             rsrvr2Status = DG_RESERVOIR_ABOVE_TARGET;
             // Request a tare for reservoir 2
             tareReservoir();
+#ifndef V_2_SYSTEM
+            // Done with draining R1, close it
+            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
             state = DG_HEAT_DISINFECT_STATE_DRAIN_R2;
         }
 
@@ -521,13 +539,22 @@
     {
         if ( TRUE == isThisLastDrain )
         {
+#ifndef V_2_SYSTEM
+            setValveState( VRD1, VALVE_STATE_OPEN );
+            setValveState( VRD2, VALVE_STATE_CLOSED );
+#else
             setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
+#endif
             rsrvr1Status = DG_RESERVOIR_ABOVE_TARGET;
             state = DG_HEAT_DISINFECT_STATE_DRAIN_R1;
         }
         else
         {
             signalDrainPumpHardStop();
+#ifndef V_2_SYSTEM
+            // Done with draining R2, close it
+            setValveState( VRD2, VALVE_STATE_CLOSED );
+#endif
             setValveState( VPI, VALVE_STATE_OPEN );
             stateTrialCounter = 0;
             stateTimer = getMSTimerCount();
@@ -567,7 +594,11 @@
         if ( ( getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER ) > MIN_INLET_TEMPERATURE_C ) &&
              ( getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR )  <=  MAX_INLET_CONDUCTIVITY_US_PER_CM ) )
         {
+#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_FLUSH_FILL_FLOW_RATE_LPM, MAX_RO_PUMP_FLUSH_FILL_PRESSURE_PSI );
             stateTimer = getMSTimerCount();
             stateTrialCounter = 0;
@@ -714,7 +745,11 @@
             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 );
             stateTimer = getMSTimerCount();
 
@@ -764,6 +799,10 @@
     {
         // Done with draining R1
         signalDrainPumpHardStop();
+#ifndef V_2_SYSTEM
+        // Close VRD1
+        setValveState( VRD1, VALVE_STATE_CLOSED );
+#endif
     }
     else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr1Status )
     {
@@ -804,10 +843,18 @@
 
             // Set the valves to drain R2 and no fill
             setValveState( VPI, VALVE_STATE_CLOSED );
+#ifndef V_2_SYSTEM
+            setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
+#else
             setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
+#endif
             setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
             setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
+#ifndef V_2_SYSTEM
+            setValveState( VRD2, VALVE_STATE_OPEN );
+#else
             setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
+#endif
             setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM );
             // Start the timer for drain timeout
             stateTimer = getMSTimerCount();
@@ -851,7 +898,12 @@
     }
     else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
     {
+#ifndef V_2_SYSTEM
+        setValveState( VRD1, VALVE_STATE_OPEN );
+        setValveState( VRD2, VALVE_STATE_CLOSED );
+#else
         setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
+#endif
         // Start the timer for drain timeout
         stateTimer = getMSTimerCount();
         rsrvr1Status = DG_RESERVOIR_ABOVE_TARGET;
@@ -893,12 +945,21 @@
 
         // Prepare for filling the reservoirs and heating the water
         setValveState( VPI, VALVE_STATE_OPEN );
+#ifndef V_2_SYSTEM
+        setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
+#else
         setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
+#endif
         setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
         setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
         setValveState( VRI, VALVE_STATE_R2_C_TO_NC );
         setValveState( VRF, VALVE_STATE_R1_C_TO_NC );
+#ifndef V_2_SYSTEM
+        setValveState( VRD1, VALVE_STATE_CLOSED );
+        setValveState( VRD2, VALVE_STATE_OPEN );
+#else
         setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
+#endif
 
         // Turn on the RO pump
         setROPumpTargetFlowRate( RO_PUMP_TARGET_FLUSH_FILL_FLOW_RATE_LPM, MAX_RO_PUMP_FLUSH_FILL_PRESSURE_PSI );
@@ -957,7 +1018,11 @@
             // Set the valves to drain R2 and no fill
             setValveState( VPI, VALVE_STATE_CLOSED );
             setValveState( VBF, VALVE_STATE_OPEN );
+#ifndef V_2_SYSTEM
+            setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
+#else
             setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NC );
+#endif
             setValveState( VDR, VALVE_STATE_RECIRC_C_TO_NC );
             setValveState( VRC, VALVE_STATE_RECIRC_C_TO_NC );
 
@@ -1025,7 +1090,12 @@
             //TODO turn off CP1 and CP2
             // Set the valves to transfer hot water from R1 to R2 and fill up R2.
             setValveState( VRO, VALVE_STATE_R2_C_TO_NC );
+#ifndef V_2_SYSTEM
+            setValveState( VRD1, VALVE_STATE_OPEN );
+            setValveState( VRD2, VALVE_STATE_CLOSED );
+#else
             setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
+#endif
             setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
             setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
             // Although there is fluid in both reservoirs, but they are set to empty
@@ -1080,15 +1150,15 @@
 
             state = DG_HEAT_DISINFECT_STATE_DISINFECT_R2_TO_R1;
         }
-#ifdef IGNORE_HEAT_DISINFECT_RSRVR_TIMEOUT
+#ifdef IGNORE_DISINFECT_RSRVR_TIMEOUT
         else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr2Status )
         {
             prevHeatDisinfectState = state;
             state = DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH;
         }
 #endif
     }
-#ifdef IGNORE_HEAT_DISINFECT_RSRVR_TIMEOUT
+#ifdef IGNORE_DISINFECT_RSRVR_TIMEOUT
     else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr1Status )
     {
         prevHeatDisinfectState = state;
@@ -1106,8 +1176,8 @@
  * temperature within a certain period of time, it transitions to water
  * cancellation state. If heat disinfect reservoir 1 to reservoir 2 is
  * completed, it transitions to the next state.
- * @details Inputs: hasPostHeatDisinfectWaitStarted, stateTimer, rsrvr1Status
- * @details Outputs: hasPostHeatDisinfectWaitStarted, stateTimer, rsrvr1Status
+ * @details Inputs: stateTimer, rsrvr1Status
+ * @details Outputs: stateTimer, rsrvr1Status
  * @return next state of the heat disinfect state machine
  *************************************************************************/
 static DG_HEAT_DISINFECT_STATE_T handleHeatDisinfectDisinfectR2ToR1State( void )
@@ -1123,7 +1193,7 @@
             break;
 
         case HEAT_DISINFECT_COMPLETE:
-            // Turn off the pumps and heaters
+            // Turn off the heaters
             // TODO turn off CP1 and CP2
             stopPrimaryHeater();
             stopTrimmerHeater();
@@ -1156,12 +1226,14 @@
 
         // De-energize all the valves that are not in the path anymore
         // and wait for the RO membrane to be cooled down.
-        // In this state, VPi and VPd must still be kept energized to make sure fresh
-        // water does not enter the circulation path the membrane is cooling down
         setValveState( VPI, VALVE_STATE_CLOSED );
         setValveState( VBF, VALVE_STATE_CLOSED );
+#ifndef V_2_SYSTEM
+        setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
+        setValveState( VRD1, VALVE_STATE_CLOSED );
+#else
         setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NC );
-
+#endif
         stateTimer = getMSTimerCount();
         state = DG_HEAT_DISINFECT_STATE_COOL_DOWN_RO_FILTER;
     }
@@ -1224,6 +1296,10 @@
     {
         isDrainPumpInMixDrainOn = TRUE;
 
+#ifndef V_2_SYSTEM
+        setValveState( VRD1, VALVE_STATE_OPEN );
+#endif
+
         // Turn on the drain pump to drain the reservoirs in open loop mode
         setDrainPumpTargetRPM( DRAIN_PUMP_RPM_IN_MIX_DRAIN );
     }
@@ -1235,8 +1311,15 @@
         }
         else if ( DG_RESERVOIR_REACHED_TARGET == rsrvr1Status )
         {
+#ifndef V_2_SYSTEM
+            // Done with draining reservoir 1
+            setValveState( VRD1, VALVE_STATE_CLOSED );
             // Set the drain valve to reservoir 2
+            setValveState( VRD2, VALVE_STATE_OPEN );
+#else
+            // Set the drain valve to reservoir 2
             setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
+#endif
 
             rsrvr2Status = DG_RESERVOIR_ABOVE_TARGET;
             stateTimer = getMSTimerCount();
@@ -1245,7 +1328,7 @@
         else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr1Status )
         {
             prevHeatDisinfectState = state;
-            state = DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH;
+            state = DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH;
         }
     }
 
@@ -1277,7 +1360,13 @@
 
         // Set the valves to fill up R1 and overflow to R2
         setValveState( VPI, VALVE_STATE_OPEN );
+#ifndef V_2_SYSTEM
+        setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
+        // Done with draining reservoir 2
+        setValveState( VRD2, VALVE_STATE_CLOSED );
+#else
         setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
+#endif
         setValveState( VPO, VALVE_STATE_FILL_C_TO_NC );
         setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
         setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
@@ -1295,7 +1384,7 @@
     else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr2Status )
     {
         prevHeatDisinfectState = state;
-        state = DG_HEAT_DISINFECT_STATE_CANCEL_WATER_PATH;
+        state = DG_HEAT_DISINFECT_STATE_CANCEL_BASIC_PATH;
     }
 
     return state;
@@ -1340,7 +1429,11 @@
             // Set the valves to rinse R2 to R1 and drain R1
             setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
             setValveState( VRO, VALVE_STATE_R2_C_TO_NC );
+#ifndef V_2_SYSTEM
+            setValveState( VRD1, VALVE_STATE_R1_C_TO_NC );
+#else
             setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
+#endif
             setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
             setDrainPumpTargetRPM( DRAIN_PUMP_TARGET_RPM );
 
@@ -1389,6 +1482,9 @@
     {
         // Done with draining R1
         signalDrainPumpHardStop();
+#ifndef V_2_SYSTEM
+            setValveState( VRD1, VALVE_STATE_CLOSED );
+#endif
     }
     else if ( DG_RESERVOIR_NOT_REACHED_TARGET == rsrvr1Status )
     {
@@ -1428,10 +1524,18 @@
 
             // De-energize all the valves and set the VDr to drain R2
             setValveState( VPI, VALVE_STATE_CLOSED );
+#ifndef V_2_SYSTEM
+            setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
+#else
             setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
+#endif
             setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
             setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
+#ifndef V_2_SYSTEM
+            setValveState( VRD2, VALVE_STATE_OPEN );
+#else
             setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
+#endif
             setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
             setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
 
@@ -1542,7 +1646,11 @@
         {
             // The fluid is hot so this is a mix drain. Set the VPd to direct the cold inlet fluid to drain
             setValveState( VPI, VALVE_STATE_OPEN );
+#ifndef V_2_SYSTEM
+            setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
+#else
             setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NC );
+#endif
 
             targetRPM = DRAIN_PUMP_RPM_IN_MIX_DRAIN;
             cancellationMode = CANCELLATION_MODE_HOT;
@@ -1567,8 +1675,13 @@
 
         if ( DG_RESERVOIR_REACHED_TARGET == rsrvr2Status )
         {
+#ifndef V_2_SYSTEM
             // Set the drain valve to reservoir 1
+            setValveState( VRD1, VALVE_STATE_OPEN );
+#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 )
@@ -1778,7 +1891,7 @@
             status = HEAT_DISINFECT_HEAT_UP_TIMEOUT;
         }
     }
-    else if ( isPartialDisinfectInProgress != TRUE && ThdTemp > HEAT_DISINFECT_START_TEMPERATURE_C )
+    else if ( ( isPartialDisinfectInProgress != TRUE ) && ( ThdTemp > HEAT_DISINFECT_START_TEMPERATURE_C ) )
     {
         // The temperature of the coldest spot is in range to start the disinfect timer
         heatDisinfectTimer           = getMSTimerCount();
Index: firmware/App/Modes/ModeRecirculate.c
===================================================================
diff -u -rd7926685f2fe3086bab183166119f0965a192a69 -r379f78f1fad668d741b3ccf1e78c69f3fccc45b5
--- firmware/App/Modes/ModeRecirculate.c	(.../ModeRecirculate.c)	(revision d7926685f2fe3086bab183166119f0965a192a69)
+++ firmware/App/Modes/ModeRecirculate.c	(.../ModeRecirculate.c)	(revision 379f78f1fad668d741b3ccf1e78c69f3fccc45b5)
@@ -85,6 +85,9 @@
     // set initial actuator states
     setValveState( VSP, VALVE_STATE_CLOSED );
     setValveState( VPI, VALVE_STATE_OPEN );
+#ifndef V_2_SYSTEM
+    setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
+#endif
     setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
     setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
     setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
Index: firmware/App/Modes/ModeStandby.c
===================================================================
diff -u -r86eec09ab556fbd970ddcae9dc622727928ee757 -r379f78f1fad668d741b3ccf1e78c69f3fccc45b5
--- firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 86eec09ab556fbd970ddcae9dc622727928ee757)
+++ firmware/App/Modes/ModeStandby.c	(.../ModeStandby.c)	(revision 379f78f1fad668d741b3ccf1e78c69f3fccc45b5)
@@ -97,7 +97,12 @@
     // set initial actuator states
     setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
     setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
+#ifndef V_2_SYSTEM
+    setValveState( VRD1, VALVE_STATE_CLOSED );
+    setValveState( VRD2, VALVE_STATE_CLOSED );
+#else
     setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
+#endif
     setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
     setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
     setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
@@ -181,7 +186,11 @@
         flushFilterRequest = FALSE;
         filterFlushStartTime = getMSTimerCount();
         setValveState( VPI, VALVE_STATE_OPEN );
-        setValveState( VPD, VALVE_STATE_OPEN );      // TODO: VPD drain state is closed for V3
+#ifndef V_2_SYSTEM
+        setValveState( VPD, VALVE_STATE_OPEN_C_TO_NC );
+#else
+        setValveState( VPD, VALVE_STATE_OPEN );  // TODO: VPD drain state is closed for V3
+#endif
         state = DG_STANDBY_MODE_STATE_FLUSH_FILTER;
     }
     else if ( TRUE == pendingStartDGRequest )
@@ -246,7 +255,11 @@
     if ( TRUE == endSampleWaterRequest )
     {
         setValveState( VPI, VALVE_STATE_CLOSED );
+#ifndef V_2_SYSTEM
+        setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
+#else
         setValveState( VPD, VALVE_STATE_CLOSED );
+#endif
         state = DG_STANDBY_MODE_STATE_IDLE;
     }
 
@@ -269,7 +282,12 @@
     if ( ( TRUE == stopSampleWaterRequest ) || ( TRUE == didTimeout( waterSampleStartTime, MAX_WATER_SAMPLE_TIME_MS ) ) )
     {
         setValveState( VSP, VALVE_STATE_CLOSED );
+
+#ifndef V_2_SYSTEM
+        setValveState( VPD, VALVE_STATE_DRAIN_C_TO_NO );
+#else
         setValveState( VPD, VALVE_STATE_OPEN );     // TODO: VPD drain state is closed for V3
+#endif
         state = DG_STANDBY_MODE_STATE_FLUSH_FILTER_IDLE;
     }
 
@@ -420,6 +438,8 @@
         requestNewOperationMode( DG_MODE_CHEM );
         status = TRUE;
     }
+
+    return status;
 }
 
 /*********************************************************************//**
Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -re86af65442a36724461317980814f0868bd8c995 -r379f78f1fad668d741b3ccf1e78c69f3fccc45b5
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision e86af65442a36724461317980814f0868bd8c995)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 379f78f1fad668d741b3ccf1e78c69f3fccc45b5)
@@ -131,7 +131,11 @@
                 activeReservoir.data = (U32)resID;
                 cmdResponse.rejected = FALSE;
                 setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
+#ifndef V_2_SYSTEM
+                setValveState( VRD1, VALVE_STATE_OPEN );
+#else
                 setValveState( VRD, VALVE_STATE_R2_C_TO_NO );
+#endif
                 setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
                 setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
                 break;
@@ -140,7 +144,11 @@
                 activeReservoir.data = (U32)resID;
                 cmdResponse.rejected = FALSE;
                 setValveState( VRF, VALVE_STATE_R1_C_TO_NC );
+#ifndef V_2_SYSTEM
+                setValveState( VRD2, VALVE_STATE_OPEN );
+#else
                 setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
+#endif
                 setValveState( VRO, VALVE_STATE_R2_C_TO_NC );
                 setValveState( VRI, VALVE_STATE_R2_C_TO_NC );
                 break;