Added average calculations