Attempt to improve steering logic a bit