Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -r0742f1d7bd194a3f678ca9d7043dc1755899f795 -r4aa373de7194cef23272b0ef201af6c1a7aaac57
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 0742f1d7bd194a3f678ca9d7043dc1755899f795)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision 4aa373de7194cef23272b0ef201af6c1a7aaac57)
@@ -526,8 +526,16 @@
     freshDialPressure     = getFilteredPressure( D18_PRES );
     spentDialPressure     = getFilteredPressure( D51_PRES );
 
-    //Set Trimmer heater Target temp every BC cycle to catch up fresh dialysate temp
-    setHeaterTargetTemperature( D45_HEAT, getD4AverageTemperature() );
+    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
+    {
+        //Set Trimmer heater Target temp every BC cycle to catch up fresh dialysate temp
+        setHeaterTargetTemperature( D45_HEAT, getD4AverageTemperature() );
+    }
+    else
+    {
+        //Set Trimmer heater Target temp every BC cycle to catch up fresh dialysate temp
+        setHeaterTargetTemperature( D45_HEAT, getD99AverageTemperature() );
+    }
 
     BOOL isFreshDialysatePressureInRange = ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG );
     BOOL isSpentDialysatePressureInRange = ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG );
@@ -741,8 +749,16 @@
     freshDialPressure     = getFilteredPressure( D18_PRES );
     spentDialPressure     = getFilteredPressure( D51_PRES );
 
-    //Set Trimmer heater Target temp every BC cycle to catch up fresh dialysate temp
-    setHeaterTargetTemperature( D45_HEAT, getD4AverageTemperature() );
+    if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
+    {
+        //Set Trimmer heater Target temp every BC cycle to catch up fresh dialysate temp
+        setHeaterTargetTemperature( D45_HEAT, getD4AverageTemperature() );
+    }
+    else
+    {
+        //Set Trimmer heater Target temp every BC cycle to catch up fresh dialysate temp
+        setHeaterTargetTemperature( D45_HEAT, getD99AverageTemperature() );
+    }
 
     BOOL isFreshDialysatePressureInRange = ( freshDialPressure >= FRESH_DIAL_PRESSURE_MIN_PSIG ) && ( freshDialPressure <= FRESH_DIAL_PRESSURE_MAX_PSIG );
     BOOL isSpentDialysatePressureInRange = ( spentDialPressure >= SPENT_DIAL_PRESSURE_MIN_PSIG ) && ( spentDialPressure <= SPENT_DIAL_PRESSURE_MAX_PSIG );