Index: firmware/App/Modes/FPModes/FlushPermeate.c
===================================================================
diff -u -rd79faa7118db6d048ce3433224b3e5a478c97a98 -rfd21e08ba076054488aa112641e0db4191ee0b35
--- firmware/App/Modes/FPModes/FlushPermeate.c	(.../FlushPermeate.c)	(revision d79faa7118db6d048ce3433224b3e5a478c97a98)
+++ firmware/App/Modes/FPModes/FlushPermeate.c	(.../FlushPermeate.c)	(revision fd21e08ba076054488aa112641e0db4191ee0b35)
@@ -19,9 +19,9 @@
 #include "Conductivity.h"
 #include "FlushPermeate.h"
 #include "FPOperationModes.h"
+#include "Level.h"
 #include "MessageSupport.h"
 #include "Messaging.h"
-#include "PermeateTank.h"
 #include "Pressure.h"
 #include "ROPump.h"
 #include "TaskGeneral.h"
@@ -141,12 +141,24 @@
 static FP_PERM_FLUSH_STATE_T handlePermeateFlushProgressState( void )
 {
     FP_PERM_FLUSH_STATE_T state = PERM_FLUSH_IN_PROGRESS;
+    LEVEL_STATE_T level = getLevelStatus( P25_LEVL );
 
 //    if ( TRUE == 1 ))// TODO Alarm and Stop State Rework
 //    {
 //        state = PERM_FLUSH_PAUSED;
 //    }
 
+    // Manual control of Permeate tank while in Permeate Flush
+    // to prevent overfill.
+    if ( LEVEL_STATE_HIGH == level )
+    {
+        setValveState( M4_VALV, VALVE_STATE_CLOSED );
+    }
+    else if ( LEVEL_STATE_LOW == level )
+    {
+        setValveState( M4_VALV, VALVE_STATE_OPEN );
+    }
+
     if( TRUE == didTimeout( permeateFlushTimer, getPermeateFlushTimeout() ) )
     {
         F32 p18conductivity = getFilteredConductivity( P18_COND );
@@ -215,7 +227,6 @@
             setValveState( P34_VALV, VALVE_STATE_CLOSED );
             setValveState( P37_VALV, VALVE_STATE_CLOSED );
             setValveState( P39_VALV, VALVE_STATE_OPEN );
-            startPermeateTankControl();
             if ( TRUE == isBoostPumpInstalled() )
             {
                 setBoostPumpTargetPressure( PERMEATE_FLUSH_BOOST_PUMP_TGT_PSI );