NB new ns layout again (still trying to find the right tradeoffs)