Making obstacle avoidance better