Merge high level nios routines with latest version