NIRWN Changes

Thank you Majella!