Index: firmware/App/Controllers/PermeateTank.c
===================================================================
diff -u -r937362196a40d7d55b1b61e33f88c382184fbf2f -r8d27c30384b9bce99420fc0751d359c4b3871ea4
--- firmware/App/Controllers/PermeateTank.c	(.../PermeateTank.c)	(revision 937362196a40d7d55b1b61e33f88c382184fbf2f)
+++ firmware/App/Controllers/PermeateTank.c	(.../PermeateTank.c)	(revision 8d27c30384b9bce99420fc0751d359c4b3871ea4)
@@ -301,21 +301,19 @@
             setValveState( M12_VALV, VALVE_STATE_OPEN );
             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 Beta1 HW and High recovery for Beta2 HW
-            setValveState( P37_VALV, VALVE_STATE_CLOSED );
             setValveState( P39_VALV, VALVE_STATE_OPEN );
+            // set P33, P34 and P37 per recovery configuration
+            setRecoveryValvesConfig();
             break;
 
         case PERMEATE_TANK_FULL_STATE:
             setValveState( M4_VALV, VALVE_STATE_CLOSED );
             setValveState( M12_VALV, VALVE_STATE_OPEN );
             setValveState( P6_VALV, VALVE_STATE_OPEN );
             setValveState( P11_VALV, VALVE_STATE_OPEN );
-            setValveState( P33_VALV, VALVE_STATE_OPEN );
-            setValveState( P34_VALV, VALVE_STATE_CLOSED );
-            setValveState( P37_VALV, VALVE_STATE_CLOSED );
             setValveState( P39_VALV, VALVE_STATE_CLOSED );
+            // set P33, P34 and P37 per recovery configuration
+            setRecoveryValvesConfig();
             break;
 
         default: