Clean up the repackaging and added more features.