Updated the find-method()