Water hope for state by 2008 end