Index: firmware/App/Controllers/MixingControl.c
===================================================================
diff -u -rf1dc3383b840c39f202b15679e0bbe2b2f7a2f83 -r42541cc4700d748d524400f61d99e288a0e11f3e
--- firmware/App/Controllers/MixingControl.c	(.../MixingControl.c)	(revision f1dc3383b840c39f202b15679e0bbe2b2f7a2f83)
+++ firmware/App/Controllers/MixingControl.c	(.../MixingControl.c)	(revision 42541cc4700d748d524400f61d99e288a0e11f3e)
@@ -201,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 );
@@ -258,8 +258,8 @@
      mixingControlBicarbVolume.ovInitData                   = 0.0F;
      mixingControlBicarbVolume.override                     = OVERRIDE_RESET;
 
-     lastAcidMixVolume                                      = DEFAULT_ACID_VOLUME_ML;
-     lastBicarbMixVolume                                    = DEFAULT_BICARB_VOLUME_ML;
+     lastAcidMixVolume                                      = 0;
+     lastBicarbMixVolume                                    = 0;
 
      mixingControlAcidVolumeKpGain.data                     = ACID_VOL_CONTROL_P_COEFFICIENT;
      mixingControlAcidVolumeKpGain.ovData                   = ACID_VOL_CONTROL_P_COEFFICIENT;
@@ -365,7 +365,7 @@
 {
     if ( getCurrentBalancingChamberExecState() > BAL_CHAMBER_STATE_IDLE )
     {
-        updatedConcentrateControlInterval();
+        updatedCMixingControlInterval();
 
         // closed loop bicarb and acid mixing controller
         handleDialysateCompositionMixing();
@@ -433,14 +433,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;
@@ -638,6 +638,7 @@
  *************************************************************************/
 static F32 getBicarbConductivityPost( void )
 {
+    //TODO: Update to return bicarb post conductivity once defined.
     return BICARB_CONDUCTIVITY_PRE;
 }
 
@@ -702,7 +703,7 @@
         //TODO: right now using the fixed conductivity , later use the calculated version API
         F32 measuredAcidBicarbMixConductivity   = getFilteredConductivity( D27_COND );
         F32 DialysateConductivity  = getDialysateTargetConductivity();
-        F32 DialysateDeltaConductivity = getDialysateTargetConductivity();
+        F32 DialysateDeltaConductivity = getDialysateDeltaConductivity();
 
         if ( TRUE != getTestConfigStatus( TEST_CONFIG_DD_ENABLE_DOSING_OPEN_LOOP_CONTROL ) )
         {