Draft update based on the IETF#90 feedback.