Non-res gpf-back system with valves