Updated NSF with latest sources