Index: firmware/App/Controllers/ConcentratePumps.h
===================================================================
diff -u -r352df4446493c8e071cc8e05fca8f191ac1bfba7 -reb97471d81e8f8fda70fafe89666e3b0afda72e7
--- firmware/App/Controllers/ConcentratePumps.h	(.../ConcentratePumps.h)	(revision 352df4446493c8e071cc8e05fca8f191ac1bfba7)
+++ firmware/App/Controllers/ConcentratePumps.h	(.../ConcentratePumps.h)	(revision eb97471d81e8f8fda70fafe89666e3b0afda72e7)
@@ -30,15 +30,10 @@
  */
 
 // ********** public definitions **********
-#ifdef __DIENER_CONC_PUMP__
-// For 100 RPM, Diener pump delivers 40ml/min,so restricing 300 RPM for now to maintain accuracy. We may allow up to 500 RPM
-// that yields 200 ml/min, but as speed increases, accuracy may drop.
-#define CONCENTRATE_PUMP_MAX_SPEED              60.0F               ///< Optimal speed for concentrate pump in mL/min
-#define UF_PUMP_SPEED                           100.0F              ///< 100 ml/min, runs at 250 RPM
-#else
-#define CONCENTRATE_PUMP_MAX_SPEED              48.0F               ///< Maximum speed for concentrate pump in mL/min
-#define UF_PUMP_SPEED                           40.0F               ///< 40 ml/min, runs at 400 RPM
-#endif
+// For 150 RPM, Diener pump delivers 60ml/min
+#define CONCENTRATE_PUMP_MAX_SPEED              60.0F               ///< Maximum Diener pump speed for concentrate pump in mL/min
+#define CONCENTRATE_PUMP_MAX_SPEED_FMI          48.0F               ///< Maximum FMI pump speed for concentrate pump in mL/min
+
 #define DEFAULT_ACID_VOLUME_ML                  0.67F               ///< Acid concentrate volume in ml.
 #define DEFAULT_BICARB_VOLUME_ML                1.15F               ///< Bicarb concentrate volume in ml.