Switch to new cv