Updated install and uninstall