Version for refactor_search -> 3