Adding more features to average calculation