Hopefully final version of aggregation