Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r1a685471524555a374854c0c9ec8e208e71fe2df -raeb1dea9ea10fcc70ae66023a87b565f29924c07
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 1a685471524555a374854c0c9ec8e208e71fe2df)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision aeb1dea9ea10fcc70ae66023a87b565f29924c07)
@@ -1126,18 +1126,8 @@
 static void updateUFVolumes( void )
 {
     DG_RESERVOIR_ID_T activeRes = getDGActiveReservoir();
-    F32 latestResVolume;
+    F32 latestResVolume = getReservoirWeightSmallFilter( activeRes );
 
-    // get volume of active reservoir
-    if ( DG_RESERVOIR_1 == activeRes )
-    {
-        latestResVolume = getLoadCellWeightInGrams( LOAD_CELL_RESERVOIR_1_PRIMARY );
-    }
-    else
-    {
-        latestResVolume = getLoadCellWeightInGrams( LOAD_CELL_RESERVOIR_2_PRIMARY );
-    }
-
     // calculate UF volumes and provide to dialysate outlet pump controller
     measUFVolume = measUFVolumeFromPriorReservoirs + ( latestResVolume - resStartVolume[ activeRes ] );
     resFinalVolume[ activeRes ] = latestResVolume;
@@ -1155,22 +1145,9 @@
  *************************************************************************/
 void setStartReservoirVolume( void )
 {
-    DG_RESERVOIR_ID_T activeRes = getDGActiveReservoir();
-    DG_RESERVOIR_ID_T inactiveRes;
-    F32 resVolume;
+    DG_RESERVOIR_ID_T inactiveRes = getDGInactiveReservoir();
+    F32 resVolume = getReservoirWeightLargeFilter( inactiveRes );
 
-    // get volume of inactive reservoir
-    if ( DG_RESERVOIR_2 == activeRes )
-    {
-        inactiveRes = DG_RESERVOIR_1;
-        resVolume = getLoadCellWeightInGrams( LOAD_CELL_RESERVOIR_1_PRIMARY );
-    }
-    else
-    {
-        inactiveRes = DG_RESERVOIR_2;
-        resVolume = getLoadCellWeightInGrams( LOAD_CELL_RESERVOIR_2_PRIMARY );
-    }
-
     // set starting baseline volume for next reservoir before we switch to it
     resStartVolume[ inactiveRes ] = resVolume;
 }
@@ -1204,22 +1181,9 @@
  *************************************************************************/
 void setFinalReservoirVolume( void )
 {
-    DG_RESERVOIR_ID_T activeRes = getDGActiveReservoir();
-    DG_RESERVOIR_ID_T inactiveRes;
-    F32 resVolume;
+    DG_RESERVOIR_ID_T inactiveRes = getDGInactiveReservoir();
+    F32 resVolume = getReservoirWeightLargeFilter( inactiveRes );
 
-    // get volume of inactive reservoir
-    if ( DG_RESERVOIR_2 == activeRes )
-    {
-        inactiveRes = DG_RESERVOIR_1;
-        resVolume = getLoadCellWeightInGrams( LOAD_CELL_RESERVOIR_1_PRIMARY );
-    }
-    else
-    {
-        inactiveRes = DG_RESERVOIR_2;
-        resVolume = getLoadCellWeightInGrams( LOAD_CELL_RESERVOIR_2_PRIMARY );
-    }
-
     // update UF volume from prior reservoirs per final res volume for last reservoir a bit after we've switched and reservoir has settled
     measUFVolumeFromPriorReservoirs -= ( resFinalVolume[ inactiveRes ] - resStartVolume[ inactiveRes ] );
     resFinalVolume[ inactiveRes ] = resVolume;