added even more stuff x2 to NNV, redux