Upgraded ndata