Advanced Water Simulation