WIP: CP added