NCDFI updates

NCDFI updates