New proposal to fix public water systems