Improved the demos