We found that the water system was not properly configured, with the pressure tank not serving as the starting point of the system and portions of the water heater piping not meeting current code requirements. We recommended redirecting the water lines to properly position the pressure tank and reworking the water heater piping to meet code, improving overall system reliability, efficiency, and safety. The existing PEX piping to the pressure tank and water heater was cut out and removed. A new sediment filter housing with a three-valve bypass was mounted to the left of the mechanical space to allow filtration and easy isolation for maintenance. The filter housing was secured to the ship-lath siding, a boiler drain was installed on the outlet to relieve pressure during cartridge changes. The homeowner was instructed on proper cartridge replacement procedures. New piping was installed from the existing poly water line below the residence up through the floor to the pressure tank inlet.