Some changes for the demo