Update for CBVs