Change to calculate averages correctly
Change to calculate averages correctly
Figures changed to accomodate new calculation changes