Finishing the demo

Finishing the demo code.