NAB Updates

* indicates required