Basic water mechanics added