Revised demo_app