Improved demos