Changes to Average class
Changes to Average class