Small changes to the demo