Added averaging for goal values.