Reduced scope of many functions to just the ns.