Improve GroupingController + User 337 Data