improve data aggregation

improve data aggregation