improve output part2
fix aggregation