* improve pre-aggregate demo