some change I cannot remember doing to cvq/cvq.cpp