repackaging, class groups added