More work on C&C optimization across the plan
Work on cut and count