Updated some aspects of the demo