Updates from Swanee Hunt

* indicates required