grouping now working with handling of change of configuration