Updated nls stuff