Index: firmware/App/Modes/Prime.c
===================================================================
diff -u -re5d1d67106a93a6cd1b5692b586625d715732e2f -r88e0f56fa5eb3af397fee7cebb49efdab54f8491
--- firmware/App/Modes/Prime.c	(.../Prime.c)	(revision e5d1d67106a93a6cd1b5692b586625d715732e2f)
+++ firmware/App/Modes/Prime.c	(.../Prime.c)	(revision 88e0f56fa5eb3af397fee7cebb49efdab54f8491)
@@ -35,20 +35,21 @@
 
 // ********** private definitions **********
 
-#define MAX_PRIME_TIME                          ( 10 * SEC_PER_MIN )                                ///< Maximum prime time (in seconds).
-#define PRIME_DATA_PUB_INTERVAL                 ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )           ///< Interval (ms/task time) at which the prime data is published on the CAN bus.
+#define MAX_PRIME_TIME                                      ( 10 * SEC_PER_MIN )                        ///< Maximum prime time (in seconds).
+#define PRIME_DATA_PUB_INTERVAL                             ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )   ///< Interval (ms/task time) at which the prime data is published on the CAN bus.
 
-#define BLOOD_PUMP_FLOW_RATE_PURGE_AIR          500                                                 ///< Blood pump flow rate during prime purge air state.
-#define BLOOD_PUMP_FLOW_RATE_CIRC_BLOOD_CIRCUIT 300                                                 ///< Blood pump flow rate during prime recirculate blood circuit state.
+#define BLOOD_PUMP_FAST_FLOW_RATE_PURGE_AIR_ML_MIN          400                                         ///< Blood pump fast flow rate to fill fluid.
+#define BLOOD_PUMP_SLOW_FLOW_RATE_PURGE_AIR_ML_MIN          150                                         ///< Blood pump slow flow rate after fluid reach lower level of air trap sensor.
+#define BLOOD_PUMP_FLOW_RATE_CIRC_BLOOD_CIRCUIT_ML_MIN      300                                         ///< Blood pump flow rate during prime recirculate blood circuit state.
 
-#define DIALYSATE_PUMP_PRIME_FLOW_RATE          300                                                 ///< Dialysate pump flow rate during priming fluid path.
-#define LOAD_CELL_VOLUME_NOISE_TOLERANCE        0.05                                                ///< Allow 5% tolerance on load cell readings.
+#define DIALYSATE_PUMP_PRIME_FLOW_RATE_ML_MIN               300                                         ///< Dialysate pump flow rate during priming fluid path.
+#define LOAD_CELL_VOLUME_NOISE_TOLERANCE                    0.05                                        ///< Allow 5% tolerance on load cell readings.
 
-#define NO_AIR_DETECTED_COUNT                   ( 20 * MS_PER_SECOND )                              ///< No air detected time period count.
-#define PURGE_AIR_TIME_OUT_COUNT                ( 60 * MS_PER_SECOND )                              ///< Time period count for purge air time out.
-#define MIN_LOAD_CELL_STEADY_VOLUME_TIME        ( 10 * MS_PER_SECOND )                              ///< Minimum time load cell reading need to remain steady in ms.
-#define PRIME_DIALYSATE_DIALYZER_TIME_LIMIT     ( 120 * MS_PER_SECOND )                             ///< Time limit for priming dialysate dialyzer circuit.
-#define PRIME_DIALYSATE_BYPASS_TIME_LIMIT       ( 120 * MS_PER_SECOND )                             ///< Time limit for priming dialysate bypass circuit.
+#define NO_AIR_DETECTED_COUNT                               ( 20 * MS_PER_SECOND )                      ///< No air detected time period count.
+#define PURGE_AIR_TIME_OUT_COUNT                            ( 60 * MS_PER_SECOND )                      ///< Time period count for purge air time out.
+#define MIN_LOAD_CELL_STEADY_VOLUME_TIME                    ( 10 * MS_PER_SECOND )                      ///< Minimum time load cell reading need to remain steady in ms.
+#define PRIME_DIALYSATE_DIALYZER_TIME_LIMIT                 ( 120 * MS_PER_SECOND )                     ///< Time limit for priming dialysate dialyzer circuit.
+#define PRIME_DIALYSATE_BYPASS_TIME_LIMIT                   ( 120 * MS_PER_SECOND )                     ///< Time limit for priming dialysate bypass circuit.
 
 /// States of the treatment reservoir management state machine.
 typedef enum PrimeReservoirMgmt_States
@@ -341,7 +342,7 @@
 
     signalDialOutPumpHardStop();
     signalDialInPumpHardStop();
-    setBloodPumpTargetFlowRate( BLOOD_PUMP_FLOW_RATE_PURGE_AIR, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+    setBloodPumpTargetFlowRate( BLOOD_PUMP_FAST_FLOW_RATE_PURGE_AIR_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
 }
 
 /*********************************************************************//**
@@ -412,6 +413,11 @@
         activateAlarmNoData( ALARM_ID_HD_PRIME_PURGE_AIR_TIME_OUT );
     }
 
+    if ( AIR_TRAP_LEVEL_FLUID == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_LOWER ) )
+    {
+        setBloodPumpTargetFlowRate( BLOOD_PUMP_SLOW_FLOW_RATE_PURGE_AIR_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+    }
+
     if ( AIR_TRAP_LEVEL_FLUID == getAirTrapLevel( AIR_TRAP_LEVEL_SENSOR_UPPER ) )
     {
         setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
@@ -420,7 +426,7 @@
         setValvePosition( VBV, VALVE_POSITION_B_OPEN );
         setValveAirTrap( STATE_CLOSED );
 
-        setBloodPumpTargetFlowRate( BLOOD_PUMP_FLOW_RATE_CIRC_BLOOD_CIRCUIT, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+        setBloodPumpTargetFlowRate( BLOOD_PUMP_FLOW_RATE_CIRC_BLOOD_CIRCUIT_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
         noAirDetectedStartTime = getMSTimerCount();
         state = HD_PRIME_SALINE_CIRC_BLOOD_CIRCUIT_STATE;
     }
@@ -493,8 +499,8 @@
             setValvePosition( VBV, VALVE_POSITION_C_CLOSE );
             setValveAirTrap( STATE_CLOSED );
 
-            setDialInPumpTargetFlowRate( DIALYSATE_PUMP_PRIME_FLOW_RATE, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
-            setDialOutPumpTargetRate( DIALYSATE_PUMP_PRIME_FLOW_RATE, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+            setDialInPumpTargetFlowRate( DIALYSATE_PUMP_PRIME_FLOW_RATE_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+            setDialOutPumpTargetRate( DIALYSATE_PUMP_PRIME_FLOW_RATE_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
 
             previousLoadCellReading = 0;
             loadcellSteadyVolumeStartTime = getMSTimerCount();
@@ -586,7 +592,7 @@
         if ( TRUE == hasDGCompletedReservoirSwitch() )
         {
             signalDialOutPumpHardStop();
-            setDialInPumpTargetFlowRate( DIALYSATE_PUMP_PRIME_FLOW_RATE, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
+            setDialInPumpTargetFlowRate( DIALYSATE_PUMP_PRIME_FLOW_RATE_ML_MIN, MOTOR_DIR_FORWARD, PUMP_CONTROL_MODE_OPEN_LOOP );
 
             setValvePosition( VDI, VALVE_POSITION_C_CLOSE );
             setValvePosition( VDO, VALVE_POSITION_C_CLOSE );