Oops, do not return new_context just yet, update and then return