WIP version of -06 for IETF91