Repackage & UI update