implementing aggregators and minor adjustments
Revert "implementing aggregators and minor adjustments"

This reverts commit c0616294fa6734d164719e65132691d62eee0637.