Updated for CCS v6