Files from the nmf branch