Better and decoupled CV