Final edit of demo_app