Index: firmware/App/Modes/ModeFill.h
===================================================================
diff -u -r604d8aaceeb8e0b650ac2054644333fc7717bb51 -r1722e975682c9e41e0b75551ada1139d3dc522a6
--- firmware/App/Modes/ModeFill.h	(.../ModeFill.h)	(revision 604d8aaceeb8e0b650ac2054644333fc7717bb51)
+++ firmware/App/Modes/ModeFill.h	(.../ModeFill.h)	(revision 1722e975682c9e41e0b75551ada1139d3dc522a6)
@@ -31,6 +31,13 @@
 
 // ********** public definitions **********
 
+typedef enum
+{
+    ACID = 0,
+    BICARB,
+    NUM_OF_CHEMICALS,
+} CHEMICAL_BOTTLES_T;
+
 /// DG broadcast dialysate fill data structure.
 typedef struct
 {
@@ -40,7 +47,7 @@
     F32 pctDiffInConductivity;                  ///< The percent difference between CD1 and CD2.
     F32 usedAcidVolumeML;                       ///< The used acid volume in ML.
     F32 usedBicarbVolumeML;                     ///< The used bicarb volume in ML.
-    F32 totalIntegratedVolumeML;                ///< Total integrated volume in milliliters.
+    F32 integratedVolumeML;                     ///< Integrated volume in milliliters.
 } DG_FILL_MODE_DATA_T;
 
 // ********** public function prototypes **********
@@ -63,9 +70,9 @@
 
 BOOL isThisTheFirstFill( void );
 
-BOOL isEmptyAcidBottle( void );
+F32  getChemicalUsedVolumeML( CHEMICAL_BOTTLES_T bottle );
 
-BOOL isEmptyBicarbBottle( void );
+void resetChemicalUsedVolumeML( CHEMICAL_BOTTLES_T bottle );
 
 BOOL testSetUsedAcidVolumeMLOverride( F32 value );
 BOOL testResetUsedAcidVolumeMLOverride( void );