code cleanup.  Added demo 8a.
code cleanup.