changes to find_and_modify behavior