Added search. Untested