CB step 1&2 changes