Eng 6591 partial aggregate before refactor