Index: firmware/App/Controllers/BalancingChamber.c
===================================================================
diff -u -rd748813399d38ef5b71d760e327e368cc82d7a38 -rf554e391302359aa2b252c6c13603d831c11cb77
--- firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision d748813399d38ef5b71d760e327e368cc82d7a38)
+++ firmware/App/Controllers/BalancingChamber.c	(.../BalancingChamber.c)	(revision f554e391302359aa2b252c6c13603d831c11cb77)
@@ -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 );
@@ -740,8 +748,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 );
Index: firmware/App/Modes/ModeGenDialysate.c
===================================================================
diff -u -rd748813399d38ef5b71d760e327e368cc82d7a38 -rf554e391302359aa2b252c6c13603d831c11cb77
--- firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision d748813399d38ef5b71d760e327e368cc82d7a38)
+++ firmware/App/Modes/ModeGenDialysate.c	(.../ModeGenDialysate.c)	(revision f554e391302359aa2b252c6c13603d831c11cb77)
@@ -236,7 +236,14 @@
             startHeater( D5_HEAT );
 
             //Turn on Trimmer heater
-            setHeaterTargetTemperature( D45_HEAT,  getD4AverageTemperature() );
+            if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
+            {
+                setHeaterTargetTemperature( D45_HEAT, getD4AverageTemperature() );
+            }
+            else
+            {
+                setHeaterTargetTemperature( D45_HEAT, getD99AverageTemperature() );
+            }
             startHeater( D45_HEAT );
 
             //Testing : Enable close loop once testing is complete
@@ -273,7 +280,14 @@
             startHeater( D5_HEAT );
 
             //Turn on Trimmer heater
-            setHeaterTargetTemperature( D45_HEAT, getD4AverageTemperature() );
+            if ( getTestConfigStatus( TEST_CONFIG_DD_FP_ENABLE_BETA_1_0_HW ) == TRUE )
+            {
+                setHeaterTargetTemperature( D45_HEAT, getD4AverageTemperature() );
+            }
+            else
+            {
+                setHeaterTargetTemperature( D45_HEAT, getD99AverageTemperature() );
+            }
             startHeater( D45_HEAT );
 
             //setDialysatePumpTargetRPM( D12_PUMP, FRESH_DIAL_PUMP_INITIAL_RPM, FALSE );