Switched to build, install discover