switch to a combined N&N
6 files changed