Updated for CB 1.7.5