Index: firmware/App/Services/Reservoirs.c
===================================================================
diff -u -r9c785a779da348df1c066ae0da2d0f53de7ea936 -r514463982373eb976e4b48a27d0f85f56e014920
--- firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 9c785a779da348df1c066ae0da2d0f53de7ea936)
+++ firmware/App/Services/Reservoirs.c	(.../Reservoirs.c)	(revision 514463982373eb976e4b48a27d0f85f56e014920)
@@ -71,8 +71,12 @@
 static F32 previousUFFlowMLP = 0.0;                                                                      ///< Previous ultrafiltration flow rate in mL/min.
 static DG_MIXING_RATIOS_T ratios;                                                                        ///< Mixing ratios and fill prep time in milliseconds structure.
 
-static const F32 RESERVOIR_DILUTION_RATIO = MAX_RESERVOIR_DILUTION / ( 1.0 - MAX_RESERVOIR_DILUTION );
+static const F32 RESERVOIR_DILUTION_RATIO = MAX_RESERVOIR_DILUTION / ( 1.0 - MAX_RESERVOIR_DILUTION );   ///< Reservoir dilution ratio.
 
+// TODO remove
+static BOOL test = FALSE;
+// TODO remove
+
 // ********** private function prototypes **********
 
 // Reservoir management functions
@@ -124,6 +128,10 @@
     ratios.acidMixingRatio      = 0.0;
     ratios.bicarbMixingRatio    = 0.0;
     ratios.timeFillPrepMS       = 0;
+
+    // TODO remove
+    test = FALSE;
+    // TODO remove
 }
 
 /*********************************************************************//**
@@ -575,7 +583,7 @@
     TREATMENT_RESERVOIR_MGMT_STATE_T state = TREATMENT_RESERVOIR_MGMT_WAIT_FOR_FILL_SETTLE_STATE;
 
     // Wait for the reservoir to settle and then send the commands to switch the active reservoir
-    if ( ( TRUE == didTimeout( reservoirSwitchStartTimeMS, RESERVOIR_SETTLE_TIME_MS ) ) && ( volSpentML >= (F32)FILL_RESERVOIR_TO_VOLUME_ML ) )
+    if ( ( TRUE == didTimeout( reservoirSwitchStartTimeMS, RESERVOIR_SETTLE_TIME_MS ) ) && ( volSpentML >= (F32)FILL_RESERVOIR_TO_VOLUME_ML ) /*&& ( FALSE == test )*/ ) // DEBUG_DENALI
     {
         DG_RESERVOIR_ID_T inactiveRes = getDGInactiveReservoir();
 
@@ -595,6 +603,9 @@
         reservoirSwitchStartTimeMS = getMSTimerCount();
 
         state = TREATMENT_RESERVOIR_MGMT_WAIT_FOR_SWITCH_SETTLE_STATE;
+
+        // This is to make sure the active reservoir stays as 2
+        test = TRUE;
     }
 
     return state;