redeveloped the aggreation. now need to test it