Version that went to CRAN with a few updates