added $nor
Merge branch 'WIP'