A Better Water Plan