NLI changes