more nb changes