find functionality updated