Bring back water speed
Simplify bubble time by using irr time