migrate to CB2 refactor