Cg breaking updates