Water supply and treatment