smaller nsmc changes