Who provides the city water now?