Updated WaterFlow to the working version

This should work, although it is not optimized whatsoever.