Update in preparation for W3C Note