modifications for CRAN