Demonstration: improvements