Changing to GoalStatus to flat