Bring back new CPs
2 test failings, no idea why.