Index: firmware/App/Services/Reservoirs.h
===================================================================
diff -u -re12f1b3d41ae133bc0975fcb126e431c2bedda59 -rbec5bb7634100c96341d19cf89e540a01aa86b1d
--- firmware/App/Services/Reservoirs.h	(.../Reservoirs.h)	(revision e12f1b3d41ae133bc0975fcb126e431c2bedda59)
+++ firmware/App/Services/Reservoirs.h	(.../Reservoirs.h)	(revision bec5bb7634100c96341d19cf89e540a01aa86b1d)
@@ -111,6 +111,7 @@
 void setDialysateHeatingParameters( DG_CMD_DIALYSATE_HEATING_PARAMS_T params );
 U32  getTargetFillVolumeML( void );
 F32  getTargetFillFlowRateLPM( void );
+U32  getTargetDrainVolumeML( void );
 F32  getPrimaryHeaterTargetTemperature( void );
 F32  getReservoirCurrentTemperature( void );
 F32  getTargetDialysateFlowLPM( void );
@@ -122,7 +123,8 @@
 void getFillChemicalCondRecord( DG_CHEMICALS_FILL_COND_CAL_RECORD_T* fillRecord );
 
 BOOL hasTargetFillVolumeBeenReached( DG_RESERVOIR_ID_T reservoirId );
-BOOL hasTargetDrainVolumeBeenReached( DG_RESERVOIR_ID_T reservoirId, U32 timeout );
+BOOL hasTargetDrainToZeroBeenReached( DG_RESERVOIR_ID_T reservoirId, U32 timeout );
+BOOL hasTargetDrainToVolumeBeenReached( DG_RESERVOIR_ID_T reservoirId, U32 targetVolumeML, U32 timeoutMS );
 void tareLoadCellsAtEmpty( DG_RESERVOIR_ID_T reservoirId );
 BOOL isReservoirTarePending( void );
 void initDrainParameters( DG_RESERVOIR_ID_T reservoirId );