Enhancement to average calculations....