added even more stuff to NNV