save NDFD as well, perhaps