Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r9c310aee18d85fe28b2f096cd3d61bd8df17937f -r8ddb7d51e6ab02591cb1c5692f62cfdf26ec7866
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 9c310aee18d85fe28b2f096cd3d61bd8df17937f)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 8ddb7d51e6ab02591cb1c5692f62cfdf26ec7866)
@@ -474,21 +474,47 @@
     if ( hasTimeOut || hasTargetReached )
     {
         result = TRUE;
+        // Reset for next drain
         reservoirLowestWeight[ reservoirId ] = MAX_RESERVOIR_WEIGHT;
-
-        if ( TRUE == tareLoadCellRequest )
-        {
-            tareLoadCellRequest = FALSE;
-            tareLoadCell( associatedLoadCell[ reservoirId ] );
-            tareLoadCell( redundantLoadCell[ reservoirId ] );
-        }
     }
 
     return result;
 }
 
 /*********************************************************************//**
  * @brief
+ * The tareLoadCellsAtEmpty function tares the load cells for the inactive
+ * reservoir when ModeDrain empties it and tare request is pending.
+ * @details Inputs: tareLoadCellRequest
+ * @details Outputs: tareLoadCellRequest
+ * @param reservoirId ID of reservoir to tare
+ * @return none
+ *************************************************************************/
+void tareLoadCellsAtEmpty( DG_RESERVOIR_ID_T reservoirId )
+{
+    if ( TRUE == tareLoadCellRequest )
+    {
+        tareLoadCellRequest = FALSE;
+        tareLoadCell( associatedLoadCell[ reservoirId ] );
+        tareLoadCell( redundantLoadCell[ reservoirId ] );
+    }
+}
+
+/*********************************************************************//**
+ * @brief
+ * The isReservoirTarePending function determines whether a reservoir tare
+ * request is currently pending.
+ * @details Inputs: tareLoadCellRequest
+ * @details Outputs: none
+ * @return tareLoadCellRequest
+ *************************************************************************/
+BOOL isReservoirTarePending( void )
+{
+    return tareLoadCellRequest;
+}
+
+/*********************************************************************//**
+ * @brief
  * The getActiveReservoir function gets the active reservoir.
  * @details Inputs: activeReservoir
  * @details Outputs: none