Index: firmware/App/Controllers/MixingControl.c
===================================================================
diff -u -r337209eec0c5a2a879f2df587e989f19f5a1effe -rcabab4c56b6840c94126b71696d2c95011cb01a0
--- firmware/App/Controllers/MixingControl.c	(.../MixingControl.c)	(revision 337209eec0c5a2a879f2df587e989f19f5a1effe)
+++ firmware/App/Controllers/MixingControl.c	(.../MixingControl.c)	(revision cabab4c56b6840c94126b71696d2c95011cb01a0)
@@ -97,8 +97,8 @@
 #define STD_DILUTION_BICARB_POST_MIX_NA             37.0F                                                                                           ///< Bicarb post mix Sodium
 #define STD_DILUTION_BICARB_POST_MIX_CHO3           33.0F                                                                                           ///< Post mix bicarbonate
 
-#define DIALYSATE_TARGET_STD_NA_SETTINGS            137.0F                                                                                          ///< Standard target sodium
-#define DIALYSATE_TARGET_STD_BICARB_SETTING         33.0F                                                                                           ///< Standard bicarb
+//#define DIALYSATE_TARGET_STD_NA_SETTINGS            137.0F                                                                                          ///< Standard target sodium
+//#define DIALYSATE_TARGET_STD_BICARB_SETTING         33.0F                                                                                           ///< Standard bicarb
 #define DIALYSATE_TARGET_USER_ADJ_SODIUM_SETTING    getTDSodiumConcentration()                                                                      ///< User Sodium
 #define DIALYSATE_TARGET_USER_ADJ_BICARB_SETTING    getTDBicarbonateConcentration()                                                                 ///< User bicarb
 
@@ -724,7 +724,7 @@
             // Control based on the measured and target conductivity
             PI_CONTROLLER_SIGNALS_DATA debugBicarbControl;
             F32 measuredBicarbConductivity = getFilteredConductivity( D17_COND );
-            F32 bicarbConductivity = getBicarbConductivityPre();//getBicarbTargetConductivity();
+            F32 bicarbConductivity = getBicarbTargetConductivity();//getBicarbConductivityPre();
 
             if ( fabs ( bicarbConductivity - measuredBicarbConductivity ) > BICARB_DEADBAND_CONTROL )
             {
@@ -755,7 +755,7 @@
 
             // TODO: use the calculated API
             F32 measuredDialysateConductivity = getFilteredConductivity( D27_COND );
-            F32 DialysateConductivity  = getTotalConductivity();//getDialysateTargetConductivity();
+            F32 DialysateConductivity  = getDialysateTargetConductivity();//getTotalConductivity();
             PI_CONTROLLER_SIGNALS_DATA debugAcidControl;
 
             if ( fabs ( DialysateConductivity - measuredDialysateConductivity ) > ACID_DEADBAND_CONTROL )