commit versions 03 and 04 of the draft-zhang