changes to Search method