Implemented a new version of search