Index: firmware/App/Modes/Dialysis.c
===================================================================
diff -u -r81c902fb595b9fcde229f8898d14e43312969f26 -r33c3a81272ce8c9bae64ae20537e9be45b11edd0
--- firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 81c902fb595b9fcde229f8898d14e43312969f26)
+++ firmware/App/Modes/Dialysis.c	(.../Dialysis.c)	(revision 33c3a81272ce8c9bae64ae20537e9be45b11edd0)
@@ -128,15 +128,17 @@
 {
     U16 i;
 
-    currentDialysisState = DIALYSIS_START_STATE;
-    currentUFState = UF_START_STATE;
+    currentDialysisState = DIALYSIS_UF_STATE;
+    currentUFState = UF_RUNNING_STATE;
     currentSalineBolusState = SALINE_BOLUS_STATE_IDLE;
 
+    lastUFTimeStamp = getMSTimerCount();
+    uFTimeMS = 0;
+
     refUFVolume = 0.0;
     measUFVolume = 0.0;
     measUFVolumeFromPriorReservoirs = 0.0;
-    // Send reset UF volumes to dialysate outlet pump
-    setDialOutUFVolumes( refUFVolume, measUFVolume );
+    setDialOutUFVolumes( refUFVolume, measUFVolume );  // Send reset UF volumes to dialysate outlet pump driver
 
     uFTimeMS = 0;
     lastUFTimeStamp = 0;
@@ -152,11 +154,12 @@
     uFAccuracyCheckTimerCtr = 0;
     lastUFVolumeChecked = 0.0;
 
-    for (i=0; i<NUM_OF_LOAD_CELLS; i++)
+    for ( i = 0; i<NUM_OF_LOAD_CELLS; i++ )
     {
         lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_START][i] = LOAD_CELL_ILLEGAL_WEIGHT_VALUE;
         lcLastSteadyWeight[RESERVOIR_STEADY_CYCLE_FINAL][i] = LOAD_CELL_ILLEGAL_WEIGHT_VALUE;
     }
+
     resetSalineBolus();
 }
 
@@ -215,32 +218,31 @@
     setValvePosition( VDO, VALVE_POSITION_B_OPEN );
     setValvePosition( VBA, VALVE_POSITION_B_OPEN );
     setValvePosition( VBV, VALVE_POSITION_B_OPEN );
-    // Restart pumps
 
+    // Restart pumps
 #ifndef _RELEASE_
     if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_BLOOD_PUMP_OPEN_LOOP ) )
     {
         mode = PUMP_CONTROL_MODE_OPEN_LOOP;
     }
 #endif
-
     setBloodPumpTargetFlowRate( setBloodFlowRate, MOTOR_DIR_FORWARD, mode );
-
 #ifndef _RELEASE_
     if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_DIALYSATE_INLET_PUMP_OPEN_LOOP ) )
     {
         mode = PUMP_CONTROL_MODE_OPEN_LOOP;
     }
 #endif
-
     setDialInPumpTargetFlowRate( setDialysateFlowRate, MOTOR_DIR_FORWARD, mode );
-
     setDialOutPumpTargetRate( setDialysateFlowRate + (S32)setUFRate, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_CLOSED_LOOP );
+
     // Start Heparin pump as appropriate
     startHeparinPump();
+
     // Tell DG to start heating dialysate
     cmdStartDGTrimmerHeater();
 
+    // Start auto-control of air trap valve
     startAirTrapControl();
 
     // Set user alarm recovery actions allowed in this sub-mode
@@ -624,10 +626,6 @@
     // Dialysis state machine
     switch ( currentDialysisState )
     {
-        case DIALYSIS_START_STATE:
-            currentDialysisState = DIALYSIS_UF_STATE;
-            break;
-
         case DIALYSIS_UF_STATE:
             currentDialysisState = handleDialysisUltrafiltrationState();
             break;
@@ -641,6 +639,9 @@
             break;
     }
 
+    // Calculate UF measured volume and provide to dialysate outlet pump controller (watch UF regardless of dialysis state)
+    updateUFVolumes();
+
     // Publish saline bolus data at set interval (whether we are delivering one or not)
     publishSalineBolusData();
 }
@@ -669,10 +670,6 @@
     // Handle current ultrafiltration state
     switch ( currentUFState )
     {
-        case UF_START_STATE:
-            currentUFState = handleUFStartState( &result );
-            break;
-
         case UF_PAUSED_STATE:
             currentUFState = handleUFPausedState( &result );
             break;
@@ -731,24 +728,6 @@
 
 /*********************************************************************//**
  * @brief
- * The handleUFStartState function handles the Start state of the
- * ultrafiltration state machine.
- * @details Inputs: maxUFVolumeML
- * @details Outputs: if ultrafiltration prescribed, ultrafiltration time is
- * initialized.
- * @param dialysisState next dialysis state
- * @return next ultrafiltration state.
- *************************************************************************/
-static UF_STATE_T handleUFStartState( DIALYSIS_STATE_T *dialysisState )
-{
-    lastUFTimeStamp = getMSTimerCount();
-    uFTimeMS = 0;
-
-    return UF_RUNNING_STATE;
-}
-
-/*********************************************************************//**
- * @brief
  * The handleUFPausedState function handles the Paused state of the
  * ultrafiltration state machine.
  * @details Inputs: none
@@ -760,9 +739,6 @@
 {
     UF_STATE_T result = UF_PAUSED_STATE;
 
-    // Calculate UF volumes and provide to dialysate outlet pump controller
-    updateUFVolumes();
-
     // Handle saline bolus start request from user
     if ( TRUE == salineBolusStartRequested )
     {
@@ -810,9 +786,6 @@
         setUFRate = 0.0;
     }
 
-    // Calculate UF volumes and provide to dialysate outlet pump controller
-    updateUFVolumes();
-
     // Handle saline bolus start request from user
     if ( TRUE == salineBolusStartRequested )
     {