Reviewed the merge to make sure update worked.