Adding obstacle dodger and removing crap