Update to CB 1.8