fixing some npr stuff