changed use of pairs to cu, cv