make water model self-contained