adding correct find before fill