Index: firmware/App/Modes/ModePreGenPermeate.c
===================================================================
diff -u -raab4ab3e723f66df31ecad571cb484d7e64b7bc8 -r74be2e300c7b0ad2a069cea4b1dc2cff06ec0d3e
--- firmware/App/Modes/ModePreGenPermeate.c	(.../ModePreGenPermeate.c)	(revision aab4ab3e723f66df31ecad571cb484d7e64b7bc8)
+++ firmware/App/Modes/ModePreGenPermeate.c	(.../ModePreGenPermeate.c)	(revision 74be2e300c7b0ad2a069cea4b1dc2cff06ec0d3e)
@@ -23,6 +23,7 @@
 #include "FPModeStandby.h"
 #include "FPOperationModes.h"
 #include "InletPressureCheck.h"
+#include "Level.h"
 #include "MessageSupport.h"
 #include "Messaging.h"
 #include "ModeGenPermeate.h"
@@ -114,6 +115,7 @@
 U32 execPreGenPMode( void )
 {
     FP_PRE_GENP_MODE_STATE_T previouspreGenPState = preGenPState;
+    LEVEL_STATE_T level = getLevelStatus();
     // execute current pre gen Permeate state
     switch ( preGenPState )
     {
@@ -146,6 +148,19 @@
             break;
     }
 
+    // Manual control of Permeate tank while in Pre-Gen.
+    // Other valves are controlled by submode.
+    if ( LEVEL_STATE_HIGH == level )
+    {
+        setValveState( M4_VALV,VALVE_STATE_CLOSED );
+        setValveState( P39_VALV, VALVE_STATE_CLOSED );
+    }
+    else if ( LEVEL_STATE_LOW == level )
+    {
+        setValveState( M4_VALV,VALVE_STATE_OPEN );
+        setValveState( P39_VALV, VALVE_STATE_OPEN );
+    }
+
     if( previouspreGenPState != preGenPState )
     {
         setModePreGenPTransition( preGenPState );
@@ -197,7 +212,6 @@
             setValveState( P39_VALV, VALVE_STATE_OPEN );
             setValveState( P20_VALV, VALVE_STATE_CLOSED );
             setValveState( P43_VALV, VALVE_STATE_CLOSED );
-            startPermeateTankControl();
             if ( TRUE == isBoostPumpInstalled() )
             {
                 setBoostPumpTargetPressure( VERIFY_WATER_BOOST_PUMP_TGT_PSI );