Changes for new protocol.