Update to improve speed and simplicity of instance selection