Improvements of the demo