Modified short_demo