removed the search part