Search method modified!