speed up / simplify aggregate