Updated to match spec