Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -re23087e0c17f6ea81d60641fdb52121a8dd5a099 -r27f3db92495948d4c1192421c1b0c20338c4a034
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision e23087e0c17f6ea81d60641fdb52121a8dd5a099)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 27f3db92495948d4c1192421c1b0c20338c4a034)
@@ -20,7 +20,6 @@
 #include "AirTrap.h"
 #include "BloodFlow.h"
 #include "Buttons.h"
-#include "DGInterface.h"
 #include "Dialysis.h"
 #include "DialInFlow.h"
 #include "DialOutFlow.h"
@@ -125,8 +124,6 @@
 
     refUFVolume = 0.0;
     measUFVolume = 0.0;
-    resFinalVolume[ DG_RESERVOIR_1 ] = 0.0;
-    resFinalVolume[ DG_RESERVOIR_2 ] = 0.0;
     measUFVolumeFromPriorReservoirs = 0.0;
 
     uFTimeMS = 0;
@@ -1121,15 +1118,16 @@
  * is the inactive reservoir) in order to get a more stable volume.
  * @details Inputs: active reservoir, load cell reading from inactive reservoir
  * @details Outputs: resStartVolume[]
+ * @param reservoirID reservoir ID to update the baseline volume.
  * @return none
  *************************************************************************/
-void setStartReservoirVolume( void )
+void setStartReservoirVolume( DG_RESERVOIR_ID_T reservoirID )
 {
-    DG_RESERVOIR_ID_T inactiveRes = getDGInactiveReservoir();
-    F32 resVolume = getReservoirWeightLargeFilter( inactiveRes );
+    F32 resVolume = getReservoirWeightLargeFilter( reservoirID );
 
     // Set starting baseline volume for next reservoir before we switch to it
-    resStartVolume[ inactiveRes ] = resVolume;
+    resStartVolume[ reservoirID ] = resVolume;
+    resFinalVolume[ reservoirID ] = resVolume;
 }
 
 /*********************************************************************//**
@@ -1143,8 +1141,7 @@
  *************************************************************************/
 void signalReservoirsSwitched( void )
 {
-    DG_RESERVOIR_ID_T activeRes = getDGActiveReservoir();
-    DG_RESERVOIR_ID_T inactiveRes = ( activeRes == DG_RESERVOIR_1 ? DG_RESERVOIR_2 : DG_RESERVOIR_1 );
+    DG_RESERVOIR_ID_T inactiveRes = getDGInactiveReservoir();
 
     // Update UF volume from prior reservoirs per tentative res volume for last reservoir
     measUFVolumeFromPriorReservoirs += ( resFinalVolume[ inactiveRes ] - resStartVolume[ inactiveRes ] );