Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r6f1f269cd7d91f41c51797d17a85a7ea249e21f3 -r58d631f8ce26bf420a3fa087d4d1d86833aba002
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 6f1f269cd7d91f41c51797d17a85a7ea249e21f3)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 58d631f8ce26bf420a3fa087d4d1d86833aba002)
@@ -139,27 +139,31 @@
         {
             case DG_RESERVOIR_1:
                 activeReservoir.data = (U32)resID;
-                cmdResponse.rejected = FALSE;
-                setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
-#ifdef V_2_SYSTEM
+                cmdResponse.rejected = FALSE;
+                setValveState( VRF, VALVE_STATE_R2_C_TO_NO );
+#ifndef V_2_SYSTEM
+                setValveState( VRD1, VALVE_STATE_CLOSED );
+#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;
-
-            case DG_RESERVOIR_2:
+                setValveState( VRO, VALVE_STATE_R1_C_TO_NO );
+                setValveState( VRI, VALVE_STATE_R1_C_TO_NO );
+                break;
+
+            case DG_RESERVOIR_2:
                 activeReservoir.data = (U32)resID;
-                cmdResponse.rejected = FALSE;
+                cmdResponse.rejected = FALSE;
                 setValveState( VRF, VALVE_STATE_R1_C_TO_NC );
-#ifdef V_2_SYSTEM
+#ifndef V_2_SYSTEM
+                setValveState( VRD2, VALVE_STATE_CLOSED );
+#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;
-
-            default:
+                setValveState( VRO, VALVE_STATE_R2_C_TO_NC );
+                setValveState( VRI, VALVE_STATE_R2_C_TO_NC );
+                break;
+
+            default:
                 // invalid reservoir given - cmd will be NAK'd w/ false result.
                 cmdResponse.rejectCode = DG_CMD_REQUEST_REJECT_REASON_INVALID_PARAMETER;
                 break;