updates for NVC & NMC compatibility