Modifying cv to be a little more correct