UPDATE: CRAN related changes