Few modifications in the demo.