Aggregation updated. Still not stable