refactored aggregate tags, seems easier