Added preliminary searching