Moving to rfc8340 ...