Completion of demo_app