Yes, this requires more changes to score averaging, and I think it'll be better in a separate PR...