Index: firmware/App/Modes/ModePreTreat.c
===================================================================
diff -u -rf53ecc014c076fc476e7963b67d688b7233579ee -r00fc3c7eac99970ae11dffe12d5432d6bcf5c92d
--- firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision f53ecc014c076fc476e7963b67d688b7233579ee)
+++ firmware/App/Modes/ModePreTreat.c	(.../ModePreTreat.c)	(revision 00fc3c7eac99970ae11dffe12d5432d6bcf5c92d)
@@ -1470,6 +1470,11 @@
             if ( ( TRUE == reservoirStatus[ DG_RESERVOIR_1 ].fillComplete ) &&
                  ( TRUE == reservoirStatus[ DG_RESERVOIR_2 ].fillComplete ) )
             {
+                F32 targetTempC       = getTreatmentParameterF32( TREATMENT_PARAM_DIALYSATE_TEMPERATURE );
+                U32 dialysateFlowMLPM = getTreatmentParameterU32( TREATMENT_PARAM_DIALYSATE_FLOW );
+
+                //setPreTreatmentHeatingParams( PRE_TREATMENT_FLUSH_FILL_TARGET_TEMP_C, PRE_TREATMENT_FLUSH_RESERVOIR_VOLUME_ML,
+                //                              DEFAULT_TARGET_FILL_FLOW_RATE_LPM, PRE_TREATMENT_HEATING_DIA_FLOW_ML_PER_MIN );
                 state = PRE_TREATMENT_RESERVOIR_MGMT_COMPLETE_STATE;
             }
             else
@@ -1596,6 +1601,7 @@
                         // Reservoir 1 has the right volume, set it to active reservoir and wait for it to be done
                         rsrvrCmd.reservoirID      = (U32)DG_RESERVOIR_1;
                         currentReservoirMgmtState = PRE_TREATMENT_RESERVOIR_MGMT_WAIT_FOR_RESERVOIR_SWITCH_STATE;
+                        cmdSetDGActiveReservoir( &rsrvrCmd );
                     }
                 }
                 else if ( reservoir1Level >= PRE_TREATMENT_TEST_CONFIG_MAX_RSRVR_VOL_ML )
@@ -1604,6 +1610,7 @@
                     if ( DG_RESERVOIR_1 == getDGActiveReservoir() )
                     {
                         rsrvrCmd.reservoirID = (U32)DG_RESERVOIR_2;
+                        cmdSetDGActiveReservoir( &rsrvrCmd );
                     }
 
                     currentReservoirMgmtState = PRE_TREATMENT_RESERVOIR_MGMT_DRAIN_CMD_STATE;
@@ -1618,22 +1625,19 @@
                     {
                         rsrvrCmd.reservoirID      = (U32)DG_RESERVOIR_2;
                         currentReservoirMgmtState = PRE_TREATMENT_RESERVOIR_MGMT_WAIT_FOR_RESERVOIR_SWITCH_STATE;
+                        cmdSetDGActiveReservoir( &rsrvrCmd );
                     }
                 }
                 else if ( reservoir2Level >= PRE_TREATMENT_TEST_CONFIG_MAX_RSRVR_VOL_ML )
                 {
                     if ( DG_RESERVOIR_2 == getDGActiveReservoir() )
                     {
                         rsrvrCmd.reservoirID = (U32)DG_RESERVOIR_1;
+                        cmdSetDGActiveReservoir( &rsrvrCmd );
                     }
 
                     currentReservoirMgmtState = PRE_TREATMENT_RESERVOIR_MGMT_DRAIN_CMD_STATE;
                 }
-
-                if ( currentReservoirMgmtState != PRE_TREATMENT_RESERVOIR_MGMT_COMPLETE_STATE )
-                {
-                    cmdSetDGActiveReservoir( &rsrvrCmd );
-                }
             }
             break;