Improved the demo