Move find-functions to update