NN and analysis edits