New water contract will bring better customer service