Nmsf & nmf

<p>Thank you so much for the detailed feedback! That really helps!</p>