Added NDFA