upgrade some of the other parts to use cc/ec