Index: firmware/App/Modes/ModeFill.c
===================================================================
diff -u -r2b9d10664884e9b20d391cc3178d3c85347cdf2c -r6f2991204047ccbceeb5461f7c35af6d8f5dfd0b
--- firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 2b9d10664884e9b20d391cc3178d3c85347cdf2c)
+++ firmware/App/Modes/ModeFill.c	(.../ModeFill.c)	(revision 6f2991204047ccbceeb5461f7c35af6d8f5dfd0b)
@@ -38,6 +38,7 @@
 #include "TaskGeneral.h"
 #include "TemperatureSensors.h"
 #include "Timers.h"
+#include "Utilities.h"
 #include "UVReactors.h"
 #include "Valves.h"
 
@@ -738,10 +739,10 @@
     DG_FILL_MODE_STATE_T result     = DG_FILL_MODE_STATE_DELIVER_DIALYSATE;
     DG_RESERVOIR_ID_T inactiveRsrvr = getInactiveReservoir();
     F32 acidConductivity            = getConductivityValue( CONDUCTIVITYSENSORS_CD1_SENSOR );
-    F32 bicarbConductivity          = getConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR );
-    F32 inletTemperature            = getTemperatureValue( (U32)TEMPSENSORS_CONDUCTIVITY_SENSOR_2 );
+    F32 bicarbConductivity          = getConductivityValue( CONDUCTIVITYSENSORS_CD2_SENSOR );         // TODO the systems team will let us know when we can use TD2 in DVT. Until then it is disabled
+    F32 inletTemperature            = getTemperatureValue( (U32)TEMPSENSORS_OUTLET_PRIMARY_HEATER ); //getTemperatureValue( (U32)TEMPSENSORS_CONDUCTIVITY_SENSOR_2 );
 
-    if ( SW_CONFIG_ENABLE_VALUE == getSoftwareConfigStatus( SW_CONFIG_ENABLE_V3_SYSTEM ) )
+    if ( HW_CONFIG_BETA == getHardwareConfigStatus() )
     {
         inletTemperature = getTemperatureValue( (U32)TEMPSENSORS_OUTLET_PRIMARY_HEATER );
     }