Added obstacles and avoidance