Updated for CB 1.5.1 Dev Build