Improve grouping, don't forget to repair when in panic