Today
merge from boat_better_shallow_water_behaviour