Updated for cp.c