Some changes
Very simple searcher