edited Group class