Switched to total-average