update to draft-08