Index: firmware/App/Monitors/Conductivity.c
===================================================================
diff -u -ra6109e69046323d34c8d92e590a07d8d4a71eb91 -rd6d33f24b37947f0590effb2d42a5eb3e6f3028b
--- firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision a6109e69046323d34c8d92e590a07d8d4a71eb91)
+++ firmware/App/Monitors/Conductivity.c	(.../Conductivity.c)	(revision d6d33f24b37947f0590effb2d42a5eb3e6f3028b)
@@ -256,27 +256,26 @@
 
     for ( sensor = FIRST_DD_COND_SENSOR; sensor < NUM_OF_CONDUCTIVITY_SENSORS; sensor++ )
     {
-        if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE )
+        if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
         {
-            // Check FPGA read counts for freshness rather than wait on fix time.
-            if ( condPrevReadCount[ sensor ] != getConductivityReadCount( sensor ) )
+            if ( sensor != D74_COND )
             {
+                calculatedConductivity = getTeensyConductivityValue( sensor );
+                freshData = TRUE;
+            }
+            else
+            {
                 calculatedConductivity = getConductivity( sensor );
-                condPrevReadCount[ sensor ] = getConductivityReadCount( sensor );
                 freshData = TRUE;
             }
         }
-
         else
         {
-            if ( sensor != D74_COND )
+            // Check FPGA read counts for freshness rather than wait on fix time.
+            if ( condPrevReadCount[ sensor ] != getConductivityReadCount( sensor ) )
             {
-                calculatedConductivity = getTeensyConductivityValue( sensor );
-                freshData = TRUE;
-            }
-            else
-            {
                 calculatedConductivity = getConductivity( sensor );
+                condPrevReadCount[ sensor ] = getConductivityReadCount( sensor );
                 freshData = TRUE;
             }
         }
@@ -344,26 +343,26 @@
 
     for ( sensor = FIRST_DD_COND_SENSOR; sensor < NUM_OF_CONDUCTIVITY_SENSORS; sensor++ )
     {
-        if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE )
+        if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
         {
-            // Check FPGA read counts for freshness rather than wait on fix time.
-            if ( condTempPrevReadCount[ sensor ] != getConductivityTemperatureReadCount( sensor ) )
+            if ( sensor != D74_COND )
             {
+                calculatedTemperature = getTeensyConductivityTemperatureValue( sensor );
+                freshData = TRUE;
+            }
+            else
+            {
                 calculatedTemperature = getConductivityTemperature( sensor );
-                condTempPrevReadCount[ sensor ] = getConductivityTemperatureReadCount( sensor );
                 freshData = TRUE;
             }
         }
         else
         {
-            if ( sensor != D74_COND )
+            // Check FPGA read counts for freshness rather than wait on fix time.
+            if ( condTempPrevReadCount[ sensor ] != getConductivityTemperatureReadCount( sensor ) )
             {
-                calculatedTemperature = getTeensyConductivityTemperatureValue( sensor );
-                freshData = TRUE;
-            }
-            else
-            {
                 calculatedTemperature = getConductivityTemperature( sensor );
+                condTempPrevReadCount[ sensor ] = getConductivityTemperatureReadCount( sensor );
                 freshData = TRUE;
             }
         }
@@ -742,12 +741,8 @@
     TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     OVERRIDE_TYPE_T ovType = getOverrideArrayPayloadFromMessage( message, &payload );
 
-    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
     {
-        result = testConductivitySensorConductivityReadingsOverride( message );
-    }
-    else
-    {
 
         if ( payload.index != D74_COND )
         {
@@ -758,6 +753,10 @@
             result = testConductivitySensorReadingsOverride( message );
         }
     }
+    else
+    {
+        result = testConductivitySensorConductivityReadingsOverride( message );
+    }
 
     return result;
 }
@@ -779,12 +778,8 @@
     TEST_OVERRIDE_ARRAY_PAYLOAD_T payload;
     OVERRIDE_TYPE_T ovType = getOverrideArrayPayloadFromMessage( message, &payload );
 
-    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE )
+    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
     {
-        result = testConductivitySensorTemperatureReadingsOverride( message );
-    }
-    else
-    {
 
         if ( payload.index != D74_COND )
         {
@@ -795,6 +790,10 @@
             result = testConductivitySensorTemperatureReadingsOverride( message );
         }
     }
+    else
+    {
+        result = testConductivitySensorTemperatureReadingsOverride( message );
+    }
 
     return result;
 }