Little norem stuff adjustment
Merge pull request #397 from Kenny9999/development

Little norem stuff adjustment