Adding better NCD functionality in progress.