revamp of the aggregator selection logic, part 1.