Final Nios changes