Change to code so it doesn't care which order the goals are in the achievements