r changes to handle external pointers