Added final searcher