improve the aggregator