Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r2039b2a517f7868280bfb762cd4ff3341edd6c21 -r113f804decb50b9511bb8b7365288285fece6628
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 2039b2a517f7868280bfb762cd4ff3341edd6c21)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 113f804decb50b9511bb8b7365288285fece6628)
@@ -76,8 +76,6 @@
 #define BP_MAX_MOTOR_SPEED_ERROR_RPM        300.0           ///< Maximum difference in speed between measured and commanded RPM.
 #define BP_MAX_FLOW_VS_SPEED_DIFF_RPM       200.0           ///< Maximum difference between measured speed and speed implied by measured flow.
 
-/// Persist time (task intervals) for flow vs. motor speed error condition.
-static const U32 BP_FLOW_VS_SPEED_PERSIST         = ( 5 * MS_PER_SECOND );
 /// Persist time (task intervals) for motor off error condition.
 static const U32 BP_OFF_ERROR_PERSIST             = ( 5 * MS_PER_SECOND );
 /// Persist time (task intervals) motor speed error condition.
@@ -121,10 +119,11 @@
 
 #define PUMP_DIR_ERROR_COUNT_MASK           0x3F            ///< Bit mask for pump direction error counter.
 
-#define BP_FLOW_ALPHA_Y_INTERCEPT           1.218           ///< Y intercept used for alpha flow coefficient calculation.
-#define BP_FLOW_WEAR_A_TERM                 0.000000007474  ///< A term used for wear portion of alpha flow coefficient.
-#define BP_FLOW_WEAR_B_TERM                 0.0006053       ///< B term used for wear portion of alpha flow coefficient.
+#define BP_FLOW_ALPHA_Y_INTERCEPT           1.2163          ///< Y intercept used for alpha flow coefficient calculation.
+#define BP_FLOW_WEAR_A_TERM                 0.000000005665  ///< A term used for wear portion of alpha flow coefficient.
+#define BP_FLOW_WEAR_B_TERM                 0.0006125       ///< B term used for wear portion of alpha flow coefficient.
 #define BP_MAX_ROTOR_COUNT_FOR_WEAR         25000           ///< Maximum rotor count for determining wear of the cartridge (negligible affect beyond this threshold).
+#define BP_FLOW_CORRECTION_FACTOR           0.9             // TODO - why do we need this
 
 /// Enumeration of blood pump controller states.
 typedef enum BloodPump_States
@@ -254,7 +253,6 @@
     initPersistentAlarm( ALARM_ID_BLOOD_PUMP_MC_DIRECTION_CHECK, 0, BP_DIRECTION_ERROR_PERSIST );
     initPersistentAlarm( ALARM_ID_BLOOD_PUMP_ROTOR_SPEED_TOO_HIGH, 0, BP_MAX_ROTOR_SPEED_ERROR_PERSIST );
     initPersistentAlarm( ALARM_ID_BLOOD_PUMP_MC_CURRENT_CHECK, 0, BP_MAX_CURR_ERROR_DURATION_MS );
-    initPersistentAlarm( ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK, 0, BP_FLOW_VS_SPEED_PERSIST );
     initPersistentAlarm( ALARM_ID_HD_BLOOD_FLOW_OUT_OF_RANGE, 0, BP_MAX_FLOW_RATE_OUT_OF_RANGE_PERSIST );
 }
 
@@ -355,7 +353,7 @@
     U32 rotCnt  = CAP( r, BP_MAX_ROTOR_COUNT_FOR_WEAR );
     F32 wear    = BP_FLOW_WEAR_A_TERM * (F32)rotCnt + BP_FLOW_WEAR_B_TERM;
     F32 alpha   = wear * artPres + BP_FLOW_ALPHA_Y_INTERCEPT;
-    F32 flow    = alpha * BP_ML_PER_ROTOR_REV * rotSpd;
+    F32 flow    = alpha * BP_ML_PER_ROTOR_REV * rotSpd * BP_FLOW_CORRECTION_FACTOR;
 
     return flow;
 }
@@ -1184,23 +1182,6 @@
     {
         SET_ALARM_WITH_1_F32_DATA( ALARM_ID_HD_BLOOD_FLOW_OUT_OF_RANGE, flow );
     }
-
-    // Flow vs. speed check only performed while in treatment mode and while we are in control to target state
-    if ( ( MODE_TREA == getCurrentOperationMode() ) && ( BLOOD_PUMP_CONTROL_TO_TARGET_STATE == bloodPumpState ) )
-    {
-        F32 speed = getMeasuredBloodPumpSpeed();
-        F32 impliedSpeed = ( (F32)targetBloodFlowRate / (F32)ML_PER_LITER ) * BP_REV_PER_LITER * BP_GEAR_RATIO;
-        F32 delta = fabs( speed - impliedSpeed );
-
-        if ( TRUE == isPersistentAlarmTriggered( ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK, delta > BP_MAX_FLOW_VS_SPEED_DIFF_RPM ) )
-        {
-            SET_ALARM_WITH_2_F32_DATA( ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK, flow, speed );
-        }
-    }
-    else
-    {
-        resetPersistentAlarmTimer( ALARM_ID_BLOOD_PUMP_FLOW_VS_MOTOR_SPEED_CHECK );
-    }
 #endif
 }