working on the search function
working on search