Index: firmware/App/Modes/ModeRecirculate.c
===================================================================
diff -u -re44aad7a9d5fa48aeaa55c65bd28ad9acde6ce05 -r6190a4ad94521b74164f1e1fbd79ed359c7c27fb
--- firmware/App/Modes/ModeRecirculate.c	(.../ModeRecirculate.c)	(revision e44aad7a9d5fa48aeaa55c65bd28ad9acde6ce05)
+++ firmware/App/Modes/ModeRecirculate.c	(.../ModeRecirculate.c)	(revision 6190a4ad94521b74164f1e1fbd79ed359c7c27fb)
@@ -44,7 +44,7 @@
 #define TARGET_RO_FLOW_RATE_L                   0.3                    ///< Target flow rate for RO pump.
 
 #define TARGET_FLUSH_LINES_RO_FLOW_RATE_L       0.6                    ///< Target flow rate for RO pump.
-#define FLUSH_LINES_VOLUME_L                    0.1                    ///< Water volume (in Liters) to flush when starting re-circulate mode.
+#define FLUSH_LINES_VOLUME_L                    0.01                    ///< Water volume (in Liters) to flush when starting re-circulate mode.
 
 // ********** private data **********
 
@@ -91,16 +91,33 @@
     setValveState( VRC, VALVE_STATE_DRAIN_C_TO_NO );
     setValveState( VDR, VALVE_STATE_DRAIN_C_TO_NO );
     setValveState( VPO, VALVE_STATE_NOFILL_C_TO_NO );
-    setROPumpTargetFlowRate( TARGET_FLUSH_LINES_RO_FLOW_RATE_L, TARGET_RO_PRESSURE_PSI );
+#ifndef V_2_SYSTEM
+    setValveStateDelayed( VRD1, VALVE_STATE_CLOSED, 0 );
+    setValveStateDelayed( VRD2, VALVE_STATE_CLOSED, 0 );
+#endif
 
     signalDrainPumpHardStop();
     stopPrimaryHeater();
     requestConcentratePumpsOff( CONCENTRATEPUMPS_CP1_ACID );
     requestConcentratePumpsOff( CONCENTRATEPUMPS_CP2_BICARB );
 
-    // UV on
+    // UV reactors on
     turnOnUVReactor( INLET_UV_REACTOR );
     turnOnUVReactor( OUTLET_UV_REACTOR );
+
+    // NOTE: The target flow rate should be set prior to setting the start primary heater
+    // because the initial guess in the heaters driver needs the target flow to calculate
+    // the new PWMs for the main and small primary heaters
+    setROPumpTargetFlowRate( TARGET_RO_FLOW_RATE_L, TARGET_RO_PRESSURE_PSI );
+    startPrimaryHeater();
+
+#ifndef _VECTORCAST_
+    {   // TODO - test code to start the fan since we're turning the heater on
+        F32 fanPWM = 0.25;
+        etpwmSetCmpA( etpwmREG6, (U32)( (S32)( ( fanPWM * (F32)(etpwmREG6->TBPRD) ) + FLOAT_TO_INT_ROUNDUP_OFFSET ) ) );
+        etpwmSetCmpB( etpwmREG6, (U32)( (S32)( ( fanPWM * (F32)(etpwmREG6->TBPRD) ) + FLOAT_TO_INT_ROUNDUP_OFFSET ) ) );
+    }
+#endif
 }
 
 /*********************************************************************//**
@@ -166,9 +183,7 @@
     // when enough water volume has flowed to flush the lines, transition to re-circ state
     if ( flushLinesVolumeL >= FLUSH_LINES_VOLUME_L )
     {
-#ifndef SKIP_RECIRC
         setValveState( VDR, VALVE_STATE_RECIRC_C_TO_NC );
-#endif
         setROPumpTargetFlowRate( TARGET_RO_FLOW_RATE_L, TARGET_RO_PRESSURE_PSI );
         result = DG_RECIRCULATE_MODE_STATE_RECIRC_WATER;
     }