Added first-try incorporation of new obstacles