improved demos for new system