renamed to search in preparation for merge