Coming up with refactoring out for installed?