Extend the demo, add some comments