all code paths now support new protocol