Updated trader aggregate calculation