Added second version of search, and simple benchmark.