Work in progress for the aggregation in new style.