Feature/better group output