updated for ndcnc2