Finish work on demo_app
Finish work on demo_app