Improved the demo a bit