Updated search scheme routine