Done all the changes for the demo