refactor
fix groups