various changes pertaining to data aggregation