Changes to demo 2