A rebuild of CCTP