Should actually get correct averages now