More changes to new protocol