Make slightly more harbour friendly