Update for CNRM code