continue cbc refactor