nmf redesign 2