More CG improvements and addition of CR