Completed the demo_app