Update to CB 1.6