Improved handling of each groups results