Updated for CB 1.6.2.R2