More changes for Demo