[nbc] Modernize