more organization of NAV category-change derivations