Added some small changes for the demo.