working on search
merge commit