refactored aggregations