Added to AverageForGoalType function