Reworked Water use analysis, linked to issue #23