Index: firmware/App/Controllers/PermeateTank.c
===================================================================
diff -u -r37ffdfd87147f589397a5f8c8f5421630ee4d879 -r30c175a7e10411efadb9b2b0f8b68528705e0621
--- firmware/App/Controllers/PermeateTank.c	(.../PermeateTank.c)	(revision 37ffdfd87147f589397a5f8c8f5421630ee4d879)
+++ firmware/App/Controllers/PermeateTank.c	(.../PermeateTank.c)	(revision 30c175a7e10411efadb9b2b0f8b68528705e0621)
@@ -32,10 +32,10 @@
 // ********** private definitions **********
 
 #define PERMEATE_TANK_PUMP_DATA_PUB_INTERVAL         ( MS_PER_SECOND / TASK_GENERAL_INTERVAL )   ///< Interval (ms/task time) for permeate tank broadcast
-#define PERMEATE_TANK_PUBLISH_COUNTER_START_COUNT    9
-#define PERMEATE_TANK_FILL_SWITCH_MS                 ( 6 * MS_PER_SECOND )
-#define PERMEATE_TANK_FULL_SWITCH_MS                 ( 1 * MS_PER_SECOND )                       ///< state switch timeout (in ms)
-#define PERMEATE_TANK_FULL_TIMEOUT_MS                ( 60 * MS_PER_SECOND )
+#define PERMEATE_TANK_PUBLISH_COUNTER_START_COUNT    9                                           ///< Publishing counter offset
+#define PERMEATE_TANK_FILL_SWITCH_MS                 ( 10 * MS_PER_SECOND )                      ///< state switch timeout in fill state ( in ms )
+#define PERMEATE_TANK_FULL_SWITCH_MS                 ( 1 * MS_PER_SECOND )                       ///< state switch timeout in full state (in ms)
+#define PERMEATE_TANK_FULL_TIMEOUT_MS                ( 60 * MS_PER_SECOND )                      ///< timeout being in full state too long ( in ms )
 
 // ********** private data **********
 
@@ -289,9 +289,12 @@
         pendingStopPermeateTankController = FALSE;
         state = PERMEATE_TANK_MANUAL_CONTROL_STATE;
     }
-    else if ( ( level == LEVEL_STATE_LOW ) && ( TRUE == didTimeout( tankFullDelayTime, PERMEATE_TANK_FULL_SWITCH_MS ) ) )
+    else if ( level == LEVEL_STATE_LOW )
     {
-        state = PERMEATE_TANK_FILL_STATE;
+        if ( TRUE == didTimeout( tankFullDelayTime, PERMEATE_TANK_FULL_SWITCH_MS ) )
+        {
+            state = PERMEATE_TANK_FILL_STATE;
+        }
     }
 
     return state;
@@ -334,8 +337,8 @@
             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 - Determine if we will allow RO rejection configs
-            setValveState( P34_VALV, VALVE_STATE_OPEN );    // to take precedence over tank control.
+            setValveState( P33_VALV, VALVE_STATE_OPEN );
+            setValveState( P34_VALV, VALVE_STATE_OPEN );
             setValveState( P37_VALV, VALVE_STATE_CLOSED );
             setValveState( P39_VALV, VALVE_STATE_CLOSED );
             setValveState( P20_VALV, VALVE_STATE_CLOSED );