ccs improvements