HOPEFULLY LAST COMMIT BEFORE CRAN