Update to the find function