Some general changes of the demo