Updated changes requested by NB.