HAP Updates

* indicates required