Improve cv-fr again