Re-arrange CC and BB for those who haven't updated yet.