changes
merge
nirq still doesn't work