nmf module redesign