Added searching
Fixed merge conflict