Master to cv rework