Undid the deletes, redid the package fix