Switch to new protocol