More changes for demo