reimplemented water mechanics