First round of CBF changes
Second round of CBF changes