Updates from NPD

1
2