Changed how find function operates