Index: firmware/App/Modes/ModeGenPermeate.c
===================================================================
diff -u -r30d20b2415fa9a6069044a54c3b1fe2c00cb894b -r337136fc77fe5628fa727aac6252a06238561a10
--- firmware/App/Modes/ModeGenPermeate.c	(.../ModeGenPermeate.c)	(revision 30d20b2415fa9a6069044a54c3b1fe2c00cb894b)
+++ firmware/App/Modes/ModeGenPermeate.c	(.../ModeGenPermeate.c)	(revision 337136fc77fe5628fa727aac6252a06238561a10)
@@ -167,12 +167,16 @@
     {
         case FP_GENP_TANK_FILL_STATE:
             setValveState( M4_VALV,VALVE_STATE_OPEN );
+            setValveState( M7_VALV, VALVE_STATE_CLOSED );
             setValveState( P6_VALV,VALVE_STATE_CLOSED );
             setValveState( P11_VALV, VALVE_STATE_OPEN );
             setValveState( P33_VALV, VALVE_STATE_OPEN );   // TODO - Change valves to handle RO rejection config
             setValveState( P34_VALV, VALVE_STATE_CLOSED ); // Current set to Medium recovery for alpha HW
             setValveState( P37_VALV, VALVE_STATE_CLOSED );
             setValveState( P39_VALV,VALVE_STATE_OPEN );
+            setValveState( P20_VALV, VALVE_STATE_CLOSED );
+            setValveState( P43_VALV, VALVE_STATE_CLOSED );
+
             if ( TRUE == isBoostPumpInstalled() )
             {
                 setBoostPumpTargetPressure( GEN_PERMEATE_BOOST_PUMP_TGT_PSI );
@@ -181,12 +185,15 @@
 
         case FP_GENP_TANK_FULL_STATE:
             setValveState( M4_VALV,VALVE_STATE_CLOSED );
+            setValveState( M7_VALV, VALVE_STATE_CLOSED );
             setValveState( P6_VALV,VALVE_STATE_CLOSED );
             setValveState( P11_VALV, VALVE_STATE_CLOSED );
             setValveState( P33_VALV, VALVE_STATE_OPEN );
             setValveState( P34_VALV, VALVE_STATE_CLOSED );
             setValveState( P37_VALV, VALVE_STATE_CLOSED );
             setValveState( P39_VALV,VALVE_STATE_OPEN );
+            setValveState( P20_VALV, VALVE_STATE_CLOSED );
+            setValveState( P43_VALV, VALVE_STATE_CLOSED );
 
             if ( TRUE == isBoostPumpInstalled() )
             {