Switching some find and modify calls to updates