Done main goal
missing bonus  goal