Lots of NN changes