Update to match mock (again)