Further revamp of protocol