Adding McBoogerballs and heuristics