Adding toggling of NPR