improvements of the demo