Simplified the aggregate