added stuff for search
merge conflict