Update to match spec