Updated to match the spec