Updated with bugfix for cv links