nrm2 support + forgot internal files