Final commit for demo_app