Move to protocol v3