Changed the way search is done