Improved the demo application