updated with new Aggregator