Today
Merge from boat_water_fx_optim