Adjusted for new cvs structure