More updates to CADIVI draft