Turnaround plan for city water woes