Added Kalev's CVO ordering code.