Updated Searcher

partially done.