Changing order of Dates
Changing to GoalStatus to flat