more tweaking of the protocol