New code for B2CC