Modify for newer CB versions