Update to cb 1.8