Updated for release
Fixed averages calculations