Moving to rfc8661 ...