refactoring
fixed groups list