Index: firmware/App/Controllers/DryBiCart.c
===================================================================
diff -u -rf8a9855f80d7f8f10a4e2468d18ee825ef8a5e72 -re6de057461dd170e037e94f55d8e4b1c5a4b6db5
--- firmware/App/Controllers/DryBiCart.c	(.../DryBiCart.c)	(revision f8a9855f80d7f8f10a4e2468d18ee825ef8a5e72)
+++ firmware/App/Controllers/DryBiCart.c	(.../DryBiCart.c)	(revision e6de057461dd170e037e94f55d8e4b1c5a4b6db5)
@@ -86,10 +86,10 @@
 #define MIN_BICARB_VOLUME_MLPM                      0.868686869                                 ///< Minimum target bicarb in mL/min.
 #define MAX_BICARB_VOLUME_MLPM                      1.8                                         ///< Maximum target bicarb volume in mL/min.
 
-#define ACID_VOL_CONTROL_P_COEFFICIENT              0.00000997                                  ///< Propotional gain (kp)
-#define ACID_VOL_CONTROL_I_COEFFICIENT              0.00003988                                  ///< Integral gain. (ki)
-#define MIN_ACID_VOLUME_MLPM                        0.653333333                                 ///< Minimum target acid volume in mL/min.
-#define MAX_ACID_VOLUME_MLPM                        0.70                                        ///< Maximum target acid volume in mL/min.
+#define ACID_VOL_CONTROL_P_COEFFICIENT              (0.00000997/2)                                 ///< Propotional gain (kp)
+#define ACID_VOL_CONTROL_I_COEFFICIENT              (0.00003988/2)                                 ///< Integral gain. (ki)
+#define MIN_ACID_VOLUME_MLPM                        0.3                                         ///< Minimum target acid volume in mL/min.
+#define MAX_ACID_VOLUME_MLPM                        1.0                                         ///< Maximum target acid volume in mL/min.
 
 
 #define STD_BICARB_DOSING                           1.146666667F                                ///< Standard bicarb dosing volume
@@ -1009,10 +1009,11 @@
  *************************************************************************/
 static DIALYSATE_MIXING_STATE_T handleDialysateOpenLoopState( DIALYSATE_MIXING_ID_T mixId )
 {
-    DIALYSATE_MIXING_STATE_T result = DIALYSATE_MIXING_OPEN_LOOP_STATE;
+    DIALYSATE_MIXING_STATE_T result;
 
     if ( BICARB_MIX_ID == mixId )
     {
+        result = DIALYSATE_MIXING_OPEN_LOOP_STATE;
 #ifdef __TEENSY_CONDUCTIVITY_DRIVER__
         F32 measuredBicarbConductivity  = getFilteredConductivity( D17_COND );
 #else
@@ -1026,6 +1027,7 @@
     }
     else if ( ACID_MIX_ID == mixId )
     {
+        result = DIALYSATE_MIXING_OPEN_LOOP_STATE;
 #ifdef __TEENSY_CONDUCTIVITY_DRIVER__
         F32 measuredAcidBicarbMixConductivity   = getFilteredConductivity( D27_COND );
 #else