Index: firmware/App/Controllers/BloodFlow.c
===================================================================
diff -u -r45627442c3b93ec57ed18cd0943eed2662fb2dbc -r19a4dfeb95b7bc9b8688e32c55b76a244f0de18d
--- firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 45627442c3b93ec57ed18cd0943eed2662fb2dbc)
+++ firmware/App/Controllers/BloodFlow.c	(.../BloodFlow.c)	(revision 19a4dfeb95b7bc9b8688e32c55b76a244f0de18d)
@@ -74,7 +74,6 @@
 #define BP_MAX_MOTOR_SPEED_WHILE_OFF_RPM    100.0F          ///< Maximum motor speed (RPM) while motor is commanded off.
 #define BP_MAX_ROTOR_VS_MOTOR_DIFF_RPM      5.0F            ///< Maximum difference in speed between motor and rotor (in rotor RPM).
 #define BP_MAX_MOTOR_SPEED_ERROR_RPM        300.0F          ///< Maximum difference in speed between measured and commanded RPM.
-#define BP_MAX_FLOW_VS_SPEED_DIFF_RPM       200.0F          ///< Maximum difference between measured speed and speed implied by measured flow.
 
 /// Persist time (task intervals) for motor off error condition.
 static const U32 BP_OFF_ERROR_PERSIST             = ( 5 * MS_PER_SECOND );
Index: firmware/App/Controllers/DialInFlow.c
===================================================================
diff -u -r45627442c3b93ec57ed18cd0943eed2662fb2dbc -r19a4dfeb95b7bc9b8688e32c55b76a244f0de18d
--- firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 45627442c3b93ec57ed18cd0943eed2662fb2dbc)
+++ firmware/App/Controllers/DialInFlow.c	(.../DialInFlow.c)	(revision 19a4dfeb95b7bc9b8688e32c55b76a244f0de18d)
@@ -66,7 +66,7 @@
 
 #define DIP_MAX_FLOW_RATE                    1320.0F         ///< Maximum measured BP flow rate allowed.
 #define DIP_MIN_FLOW_RATE                   -1320.0F         ///< Minimum measured BP flow rate allowed.
-#define DIP_MAX_FLOW_VS_SPEED_DIFF_RPM       200.0F          ///< Maximum difference between measured motor speed and speed implied by measured flow.
+#define DIP_MAX_FLOW_VS_SPEED_DIFF_RPM       350.0F          ///< Maximum difference between measured motor speed and speed implied by measured flow.
 #define DIP_MAX_MOTOR_SPEED_WHILE_OFF_RPM    100.0F          ///< Maximum motor speed (RPM) while motor is commanded off.
 #define DIP_MAX_ROTOR_VS_MOTOR_DIFF_RPM      5.0F            ///< Maximum difference in speed between motor and rotor (in rotor RPM).
 #define DIP_MAX_MOTOR_SPEED_ERROR_RPM        300.0F          ///< Maximum difference in speed between measured and commanded RPM.
@@ -109,7 +109,7 @@
 /// Macro converts flow rate to estimate PWM needed to achieve it.
 #define DIP_PWM_FROM_ML_PER_MIN(rate)        ( ( ((rate)*(rate)) * 0.000001 ) + ( (rate) * 0.0005 ) + 0.126 + DIP_PWM_ZERO_OFFSET )
 //#define DIP_PWM_FROM_ML_PER_MIN(rate)        ( (rate) * DIP_ML_PER_MIN_TO_PUMP_RPM_FACTOR * DIP_GEAR_RATIO * DIP_MOTOR_RPM_TO_PWM_DC_FACTOR + DIP_PWM_ZERO_OFFSET )
-/// Conversion from PWM duty cycle % to commanded pump motor speed.
+/// Conversion from PWM duty cycle % to commanded pump motor speed.  PWM range is 10% to 90%.  RPM range is 0 to 3200.  3200 / 0.8 = 4000.
 #define DIP_PWM_TO_MOTOR_SPEED_RPM(pwm)      ( ((pwm) - DIP_PWM_ZERO_OFFSET) * 4000.0F )
 
 /// Measured dialIn flow is filtered w/ moving average.
@@ -1201,9 +1201,9 @@
     {
         F32 flow = (F32)targetDialInFlowRate;
         F32 speed = getMeasuredDialInPumpSpeed();
-        F32 impliedSpeed = DIP_PWM_TO_MOTOR_SPEED_RPM( DIP_PWM_FROM_ML_PER_MIN( flow ) );
+        F32 impliedSpeed = ( flow * DIP_ML_PER_MIN_TO_PUMP_RPM_FACTOR * DIP_GEAR_RATIO );
         F32 delta = fabs( speed - impliedSpeed );
-
+
         if ( delta > DIP_MAX_FLOW_VS_SPEED_DIFF_RPM )
         {
             if ( ++errorDialInFlowVsMotorSpeedPersistTimerCtr >= DIP_FLOW_VS_SPEED_PERSIST )