Updated water tracking - down to almost nothing
Revised