Updated searcher