--Completed NDFT