Index: firmware/App/Controllers/Heaters.c
===================================================================
diff -u -r94789b2f2324d5901685b6ff7b6224d4af3a0276 -ra6109e69046323d34c8d92e590a07d8d4a71eb91
--- firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision 94789b2f2324d5901685b6ff7b6224d4af3a0276)
+++ firmware/App/Controllers/Heaters.c	(.../Heaters.c)	(revision a6109e69046323d34c8d92e590a07d8d4a71eb91)
@@ -485,17 +485,18 @@
     // finds the delta temperature to be added with the target temperature
     // to maintain the target temperature at dialyzer.
     // Lets calculate the B1,B2 and B3 heat dissipation factors
-    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) )
+    if ( TRUE == getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) )
     {
+        heatDissipation_b3 = calculateHeatDissipationB3();
+        heatDissipation_b1b2 = calculateHeatDissipationB1andB2();
+
+    }
+    else
+    {
         // based on Beta2.0 heat loss model
         heatDissipation_b3 = calculateBeta2HeatDissipationB3();
         heatDissipation_b1b2 = calculateBeta2HeatDissipationB1andB2();
     }
-    else
-    {
-        heatDissipation_b3 = calculateHeatDissipationB3();
-        heatDissipation_b1b2 = calculateHeatDissipationB1andB2();
-    }
 
     // Reverse calculation of target temp at D28 to get the target dialyzer temperature
     targetTempAtD28 = calculateInitialTemp( targetTemp, heatDissipation_b3 );
@@ -521,13 +522,13 @@
         F32 targetTempfromTD            = getTDTargetDialysateTemperature();
         F32 measuredTempAtDialyzer      = 0.0F;
 
-        if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_2_0_HW ) != TRUE )
+        if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_9_HW ) != TRUE )
         {
-            measuredTempAtDialyzer      = getTeensyConductivityTemperatureValue( D27_COND );
+            measuredTempAtDialyzer      = getFilteredConductivitySensorTemperature( D27_COND );
         }
         else
         {
-            measuredTempAtDialyzer      = getConductivityTemperature( D27_COND );
+            measuredTempAtDialyzer      = getTeensyConductivityTemperatureValue( D27_COND );
         }
 
         F32 calcTargetTemp              = getHeaterTargetTemperature( D5_HEAT );