Some CV changes...