water supply system overhaul