updated for CB 1.5.2