Repackaging and adding some