Changed the group class only a little