extra NDArray upgrades