More changes to protocol