Made CC compatible