Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r25770b4b27e75e730d89ac046f7db405b1bfe39f -rc20d71064bad67c2db392c6383bb410e8a7dfa2a
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 25770b4b27e75e730d89ac046f7db405b1bfe39f)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision c20d71064bad67c2db392c6383bb410e8a7dfa2a)
@@ -79,12 +79,8 @@
  * @return none
  *************************************************************************/
 void initReservoirs( void )
-{
-    activeReservoir.data = 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( RESERVOIR_1 );
     fillVolumeTargetMl.data = DEFAULT_FILL_VOLUME_ML;
     drainVolumeTargetMl.data = DEFAULT_DRAIN_VOLUME_ML;
 }