Updated for CCS v6
Updated for CCS v6