Baldwin considers water rate structure changes