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;