bring in weird fork Rscustom master