Nov21Changes

These are changes based on feedback from Example Task Force meeting on
November 14. Committed Nov 21