Optimised water

should no longer cause slowdowns in large quantities