More changes to new CofCs prototypes