Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -rc6f3b01d1b0a5e3fdf480a7ee205ca349e10d6d2 -rf88ce1aa5a00106b6ba51a625fe4c1d8f0408cfd
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision c6f3b01d1b0a5e3fdf480a7ee205ca349e10d6d2)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision f88ce1aa5a00106b6ba51a625fe4c1d8f0408cfd)
@@ -148,10 +148,12 @@
     maxUFVolumeML = maxUFVol;
     setUFRate = uFRate;
 
-    setBloodPumpTargetFlowRate( setBloodFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );           // TODO - test code - remove later
-    setDialInPumpTargetFlowRate( setDialysateFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-//    setBloodPumpTargetFlowRate( setBloodFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );       // TODO - restore these later
-//    setDialInPumpTargetFlowRate( setDialysateFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
+    if ( TREATMENT_DIALYSIS_STATE == getTreatmentState() )
+    {
+        setBloodPumpTargetFlowRate( setBloodFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
+        setDialInPumpTargetFlowRate( setDialysateFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
+        setDialOutPumpTargetRate( setDialysateFlowRate + (S32)setUFRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
+    }
 }
 
 /*********************************************************************//**
@@ -168,8 +170,8 @@
 {
     lastUFTimeStamp = getMSTimerCount();
     setDialOutUFVolumes( refUFVolume, measUFVolume );
-    setBloodPumpTargetFlowRate( setBloodFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-    setDialInPumpTargetFlowRate( setDialysateFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+    setBloodPumpTargetFlowRate( setBloodFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
+    setDialInPumpTargetFlowRate( setDialysateFlowRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
     setDialOutPumpTargetRate( setDialysateFlowRate + (S32)setUFRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
     // TODO - Heparin pump
 }
@@ -186,8 +188,8 @@
  *************************************************************************/
 void stopDialysis( void )
 {
-    setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-    setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+    setBloodPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
+    setDialInPumpTargetFlowRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
     setDialOutPumpTargetRate( 0, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
 }
 
@@ -357,7 +359,7 @@
             currentDialysisState = handleDialysisUltrafiltrationState();
             break;
 
-        case DIALYSIS_SOLUTION_INFUSION_STATE:
+        case DIALYSIS_SALINE_BOLUS_STATE:
             currentDialysisState = handleDialysisSolutionInfusionState();
             break;
 
@@ -421,7 +423,7 @@
  *************************************************************************/
 static DIALYSIS_STATE_T handleDialysisSolutionInfusionState( void )
 {
-    DIALYSIS_STATE_T result = DIALYSIS_SOLUTION_INFUSION_STATE;
+    DIALYSIS_STATE_T result = DIALYSIS_SALINE_BOLUS_STATE;
 
     // TODO -