Improvements to feedback and grouping