City Hopes to Equalize Electric and Water Rates