FIXUP Clarify protocol spec after review comments