Minor changes to the protocol