FInal commit for demo_app