Index: firmware/App/Controllers/MixingControl.c
===================================================================
diff -u -rc7d90a953d526f987d4f41f24b59ed64548e6fee -rca64c6349b6388b515ebf7087b0e80e0bd41bad4
--- firmware/App/Controllers/MixingControl.c	(.../MixingControl.c)	(revision c7d90a953d526f987d4f41f24b59ed64548e6fee)
+++ firmware/App/Controllers/MixingControl.c	(.../MixingControl.c)	(revision ca64c6349b6388b515ebf7087b0e80e0bd41bad4)
@@ -397,6 +397,42 @@
 
 /*********************************************************************//**
  * @brief
+ * The getTotalConductivity function gets the total conductivity of bicarb and acid
+ * @details \b Inputs: none
+ * @details \b Outputs: none
+ * @return conductivity
+ *************************************************************************/
+F32 getTotalConductivity( void )
+{
+    return TOTAL_CONDUCTIVITY;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The getAcidConducivityPost function gets the acid conductivity post
+ * @details \b Inputs: none
+ * @details \b Outputs: none
+ * @return conductivity
+ *************************************************************************/
+F32 getAcidConducivityPost( void )
+{
+    return ACID_CONDUCTIVITY_POST;
+}
+
+/*********************************************************************//**
+ * @brief
+ * The getBicarbConductivityPost function gets the bicarb conductivity post
+ * @details \b Inputs: none
+ * @details \b Outputs: none
+ * @return conductivity
+ *************************************************************************/
+static F32 getBicarbConductivityPost( void )
+{
+    return BICARB_CONDUCTIVITY_PRE;
+}
+
+/*********************************************************************//**
+ * @brief
  * The setAcidMixVol function sets acid mix volume provided by the controller
  * flag value to be True.
  * @details \b Inputs: none
@@ -568,42 +604,6 @@
 
 /*********************************************************************//**
  * @brief
- * The getTotalConductivity function gets the total conductivity of bicarb and acid
- * @details \b Inputs: none
- * @details \b Outputs: none
- * @return conductivity
- *************************************************************************/
-F32 getTotalConductivity( void )
-{
-    return TOTAL_CONDUCTIVITY;
-}
-
-/*********************************************************************//**
- * @brief
- * The getAcidConducivityPost function gets the acid conductivity post
- * @details \b Inputs: none
- * @details \b Outputs: none
- * @return conductivity
- *************************************************************************/
-F32 getAcidConducivityPost( void )
-{
-    return ACID_CONDUCTIVITY_POST;
-}
-
-/*********************************************************************//**
- * @brief
- * The getBicarbConductivityPost function gets the bicarb conductivity post
- * @details \b Inputs: none
- * @details \b Outputs: none
- * @return conductivity
- *************************************************************************/
-static F32 getBicarbConductivityPost( void )
-{
-    return BICARB_CONDUCTIVITY_PRE;
-}
-
-/*********************************************************************//**
- * @brief
  * The getBicarbConductivityPre function gets the bicarb conductivity pre
  * @details \b Inputs: none
  * @details \b Outputs: none
Index: firmware/App/Controllers/MixingControl.h
===================================================================
diff -u -rc7d90a953d526f987d4f41f24b59ed64548e6fee -rca64c6349b6388b515ebf7087b0e80e0bd41bad4
--- firmware/App/Controllers/MixingControl.h	(.../MixingControl.h)	(revision c7d90a953d526f987d4f41f24b59ed64548e6fee)
+++ firmware/App/Controllers/MixingControl.h	(.../MixingControl.h)	(revision ca64c6349b6388b515ebf7087b0e80e0bd41bad4)
@@ -33,8 +33,8 @@
 
 // ********** public definitions **********
 
-#define DIALYSATE_TARGET_STD_NA_SETTINGS            137.0F                                                                                          ///< Standard target sodium
-#define DIALYSATE_TARGET_STD_BICARB_SETTING         33.0F
+#define DIALYSATE_TARGET_STD_NA_SETTINGS     137.0F     ///< Standard target sodium
+#define DIALYSATE_TARGET_STD_BICARB_SETTING  33.0F      ///< Standard target bicarbonate
 
 #pragma pack(push, 1)
 /// mixing control data structure
Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -rc7d90a953d526f987d4f41f24b59ed64548e6fee -rca64c6349b6388b515ebf7087b0e80e0bd41bad4
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision c7d90a953d526f987d4f41f24b59ed64548e6fee)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision ca64c6349b6388b515ebf7087b0e80e0bd41bad4)
@@ -21,12 +21,12 @@
 #include "ConcentratePumps.h"
 #include "Conductivity.h"
 #include "DialysatePumps.h"
-#include "MixingControl.h"
 #include "FpgaDD.h"
 #include "Heaters.h"
 #include "Level.h"
 #include "MessagePayloads.h"
 #include "Messaging.h"
+#include "MixingControl.h"
 #include "ModeGenDialysate.h"
 #include "ModeStandby.h"
 #include "OperationModes.h"
@@ -1217,13 +1217,12 @@
  *************************************************************************/
 static void checkDialysateConductivity( void )
 {
-    F32 measuredBicarbConductivity       = getFilteredConductivity( D17_COND );
-    F32 measuredMixedDialysateCond       = getFilteredConductivity( D27_COND );
+    F32 measuredBicarbConductivity       = getFilteredConductivity( D74_COND );
     F32 measuredDialysateConductivity    = getFilteredConductivity( D29_COND );
-    F32 measuredAcidConductivity         = measuredMixedDialysateCond - measuredBicarbConductivity;
+    F32 measuredAcidConductivity         = measuredDialysateConductivity - measuredBicarbConductivity;
     F32 theoreticalBicarbConductivity    = getBicarbConductivityPre();
-    F32 theoreticalAcidConductivity        = getAcidConducivityPost();
-    F32 theoreticalDialysateConductivity   = getTotalConductivity();
+    F32 theoreticalAcidConductivity      = getAcidConducivityPost();
+    F32 theoreticalDialysateConductivity = getTotalConductivity();
     F32 condPercentFactor                = ( DIALYSATE_CONDUCTIVITY_OUT_OF_TARGET_PERCENT / 100.0F );
     F32 bicarbLowThreshold               = theoreticalBicarbConductivity * ( 1.0F - condPercentFactor );
     F32 bicarbHighThreshold              = theoreticalBicarbConductivity * ( 1.0F + condPercentFactor );
@@ -1236,7 +1235,7 @@
     BOOL isAcidCondBelowTarget           = ( measuredAcidConductivity < acidLowThreshold ? TRUE : FALSE );
     BOOL isAcidCondAboveTarget           = ( measuredAcidConductivity > acidHighThreshold ? TRUE : FALSE );
     BOOL isDialysateCondBelowTarget      = ( measuredDialysateConductivity < dialysateLowThreshold ? TRUE : FALSE );
-    BOOL isDialysateCondAboveTarget        = ( measuredDialysateConductivity > dialysateHighThreshold ? TRUE : FALSE );
+    BOOL isDialysateCondAboveTarget      = ( measuredDialysateConductivity > dialysateHighThreshold ? TRUE : FALSE );
 
     if ( ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_DISABLE_CONDUCTIVITY_ALARMS ) ) ||
          ( theoreticalBicarbConductivity <= 0.0F ) ||