update 9/12: added water