Changing search to find
Merged