derp
derp
some optimization to Water