adaptations to new NN delivery from RD, 20130308