Added the rest of the goals too.