Upgraded Analysis and Design Tool Helps Safeguard Water Systems