CV improvements & additions