added NR and some other changes