Slightly better obstacle avoidance
merge