A lot of changes - refactoring, threading, performance, new nrs, etc