Index: firmware/App/Controllers/MixingControl.c
===================================================================
diff -u -r9e20dd51e0cd69933306fb855f590dfc32ddd67b -r02dbfcdab541781a4ba310eb6e7f9278c0764887
--- firmware/App/Controllers/MixingControl.c	(.../MixingControl.c)	(revision 9e20dd51e0cd69933306fb855f590dfc32ddd67b)
+++ firmware/App/Controllers/MixingControl.c	(.../MixingControl.c)	(revision 02dbfcdab541781a4ba310eb6e7f9278c0764887)
@@ -46,8 +46,8 @@
 #define MIXING_CONTROL_DATA_PUBLISH_INTERVAL        ( 250 / TASK_GENERAL_INTERVAL )                         ///< Interval (ms/task time) at which the mixing control data published.
 
 // drybicarb mixing
-#define BICARB_VOL_CONTROL_P_COEFFICIENT            ( 0.00008484F * 2 )                                     ///< Bicarb proportional gain (kp)
-#define BICARB_VOL_CONTROL_I_COEFFICIENT            ( 0.00033936F / 4 )                                     ///< Bicarb integral gain. (ki)
+#define BICARB_VOL_CONTROL_P_COEFFICIENT            ( 0.00008484F )                                         ///< Bicarb proportional gain (kp)
+#define BICARB_VOL_CONTROL_I_COEFFICIENT            ( 0.00033936F / 8 )                                     ///< Bicarb integral gain. (ki)
 #define MIN_BICARB_VOLUME_ML                        0.4F                                                    ///< Minimum bicarb volume in mL
 #define MAX_BICARB_VOLUME_ML                        1.8F                                                    ///< Maximum bicarb volume in mL
 
@@ -71,11 +71,9 @@
 
 #define BICARB_MIX_CONTROL_INTERVAL_MULTIPLIER      ( 3 * MS_PER_SECOND / TASK_GENERAL_INTERVAL )           ///< Interval (ms/task time) at which the bicarb mix is controlled.
 #define ACID_MIX_CONTROL_INTERVAL_MULTIPLIER        ( 5 * MS_PER_SECOND / TASK_GENERAL_INTERVAL )           ///< Interval (ms/task time) at which the dialysate mix is controlled.
-//#define BICARB_MIX_CONTROL_INTERVAL                 ( 9 * MS_PER_SECOND / TASK_GENERAL_INTERVAL )           ///< Interval (ms/task time) at which the bicarb mix is controlled.
-//#define ACID_MIX_CONTROL_INTERVAL                   ( 15 * MS_PER_SECOND / TASK_GENERAL_INTERVAL )          ///< Interval (ms/task time) at which the dialysate mix is controlled.
 
-#define BICARB_DEADBAND_CONTROL                     15.0F                                                   ///< Bicarb dead band control
-#define ACID_DEADBAND_CONTROL                       50.0F                                                   ///< Acid dead band control
+#define BICARB_DEADBAND_CONTROL                     30.0F                                                   ///< Bicarb dead band control
+#define ACID_DEADBAND_CONTROL                       70.0F                                                   ///< Acid dead band control
 
 // Proportioning Ratios: 1 Part Acid : 1.72 Parts Bicarb : 42.28 Parts Water
 // Total parts = 1 + 1.72 + 42.28 = 45.0
@@ -203,7 +201,7 @@
 
 static void setBicarbMixVol( F32 targetValue );
 static void setAcidMixVol( F32 targetValue );
-static void updatedConcentrateControlInterval( void );
+static void updatedCMixingControlInterval( void );
 
 static F32 getBicarbDeltaConductivity( void );
 static F32 getBicarbTargetConductivity( void );
@@ -364,7 +362,7 @@
 {
     if ( getCurrentBalancingChamberExecState() > BAL_CHAMBER_STATE_IDLE )
     {
-        updatedConcentrateControlInterval();
+        updatedCMixingControlInterval();
 
         // closed loop bicarb and acid mixing controller
         handleDialysateCompositionMixing();
@@ -432,14 +430,14 @@
 
 /*********************************************************************//**
  * @brief
- * The updatedConcentrateControlInterval function sets both acid and bicarb
+ * The updatedCMixingControlInterval function sets both acid and bicarb
  * Mix volume provided by the controller
  * @details \b Inputs: none
  * @details \b Outputs: mixingControlBicarbMixVolume
  * @param targetValue bicarb Mix volume
  * @return TRUE if successful, FALSE if not.
  *************************************************************************/
-static void updatedConcentrateControlInterval( void )
+static void updatedCMixingControlInterval( void )
 {
     F32 tdDialysateFlowRate = 0.0F;
     F32 balChamberSwitchingFreq = 0.0F;