adding search and remove