Now passes R CMD CHECK