-- Improved demonstration

Signed off by Mark Farrell<markfarr2011@gmail.com>