Improved graphical demo