Changed from R extension