Small changes to the demo 2