Search implemented
Merging changes
Merging code