Index: firmware/App/Modes/ModeHeatDisinfect.c
===================================================================
diff -u -rdf70610b0fd07ef4757da8ab504ecc856e178fe1 -r28db3416e8183d1dfdbb047e269624a18d847a29
--- firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision df70610b0fd07ef4757da8ab504ecc856e178fe1)
+++ firmware/App/Modes/ModeHeatDisinfect.c	(.../ModeHeatDisinfect.c)	(revision 28db3416e8183d1dfdbb047e269624a18d847a29)
@@ -58,7 +58,7 @@
 #define MAX_INLET_CONDUCTIVITY_US_PER_CM       2000.0                                      ///< Maximum water inlet conductivity in us/cm
 
 // Flush circulation path state defines
-#define RO_PUMP_TARGET_FLUSH_FILL_FLOW_RATE_LPM   0.8                                      ///< RO pump target flow rate during flush/fill in L/min. TODO original flow was 0.8
+#define RO_PUMP_TARGET_FLUSH_FILL_FLOW_RATE_LPM   0.6                                      ///< RO pump target flow rate during flush/fill in L/min. TODO original flow was 0.8
 #define MAX_RO_PUMP_FLUSH_FILL_PRESSURE_PSI       130                                      ///< Maximum RO pump pressure during flush/fill states in psi.
 #define FLUSH_CICRCULATION_WAIT_TIME_MS   ( 30 * MS_PER_SECOND )                           ///< Flush/rinse circulation path wait time in milliseconds. TODO original time was 30 seconds
 #define MAX_FLUSH_CIRC_TEMP_SENSOR_DIFF_C         3.0                                      ///< Maximum flush circulation temperature difference tolerance in C.
@@ -75,7 +75,7 @@
 #define HEAT_DISINFECT_START_TEMPERATURE_C      50.0                                       ///< Heat disinfect minimum acceptable temperature in C. TODO original temperature was 81.0
 
 // R1 to R2 & R2 to R1 heat disinfect circulation
-#define HEAT_DISINFECT_TARGET_RO_FLOW_LPM        0.8                                       ///< Heat disinfect target RO flow rate in L/min. TODO original value was 0.8
+#define HEAT_DISINFECT_TARGET_RO_FLOW_LPM        0.6                                       ///< Heat disinfect target RO flow rate in L/min. TODO original value was 0.8
 #define HEAT_DISINFECT_MAX_RO_PRESSURE_PSI        30                                       ///< Heat disinfect maximum RO pressure in psi.
 #define HEAT_DISINFECT_TARGET_DRAIN_PRES_PSI     1.0                                       ///< Heat disinfect target drain outlet pressure in psi.
 #define HEAT_DISINFECT_TIME_MS              ( 0.5 * 60 * MS_PER_SECOND )                   ///< Heat disinfect time for each section in milliseconds.  TODO original time was 10 minutes
@@ -497,8 +497,8 @@
     if ( didTimeout( stateTimer, FLUSH_DRAIN_WAIT_TIME_MS ) )
     {
         // If the inlet temperature and conductivity are in range, move onto the next state
-        if ( getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER ) > MIN_INLET_TEMPERATURE_C &&
-             getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR ) >  MIN_INLET_CONDUCTIVITY_US_PER_CM )
+        if ( getTemperatureValue( TEMPSENSORS_INLET_PRIMARY_HEATER ) > MIN_INLET_TEMPERATURE_C /*&& TODO un-comment when the conductivity sensor is reading correctly
+             getConductivityValue( CONDUCTIVITYSENSORS_CPI_SENSOR ) >  MIN_INLET_CONDUCTIVITY_US_PER_CM*/ )
         {
             setValveState( VPD, VALVE_STATE_OPEN_C_TO_NO );
             setROPumpTargetFlowRate( RO_PUMP_TARGET_FLUSH_FILL_FLOW_RATE_LPM, MAX_RO_PUMP_FLUSH_FILL_PRESSURE_PSI );
@@ -1155,8 +1155,8 @@
  * @brief
  * The handleHeatDisinfectCancelModeWaterPath function handles the
  * heat disinfect cancel mode cold water path state.
- * @details Inputs: none TODO fill up
- * @details Outputs: none TODO fill up
+ * @details Inputs: isR1Full, isR2Full
+ * @details Outputs: isR1Full, isR2Full
  * @return next state of the heat disinfect state machine
  *************************************************************************/
 static DG_HEAT_DISINFECT_STATE_T handleHeatDisinfectCancelModeWaterPath( void )