Slight changes for the demo