refactor some groups.