Changed the way numbering works on collect goals.