Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r484b185f0cf4b2ea0ba9de331573952b1b5124b4 -r9ce06772b2f651c57144327e6cbf886e2bc22dee
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 484b185f0cf4b2ea0ba9de331573952b1b5124b4)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 9ce06772b2f651c57144327e6cbf886e2bc22dee)
@@ -77,12 +77,8 @@
  * @return none
  *************************************************************************/
 void initReservoirs( void )
-{
-    activeReservoir.data = DG_RESERVOIR_2;
-    setValveState( VRF, VALVE_STATE_R1_C_TO_NC );
-    setValveState( VRD, VALVE_STATE_R1_C_TO_NC );
-    setValveState( VRO, VALVE_STATE_R2_C_TO_NC );
-    setValveState( VRI, VALVE_STATE_R2_C_TO_NC );
+{
+    setActiveReservoirCmd( DG_RESERVOIR_1 );
     fillVolumeTargetMl.data = DEFAULT_FILL_VOLUME_ML;
     drainVolumeTargetMl.data = DEFAULT_DRAIN_VOLUME_ML;
 }