Added a better search
Merged