WaterFlow takes Plants into account

Almost. I don't think plants remove water from the system (since I
didn't write Plant), but I'm working on resolving the issue with Robert