Merging adding_search and master