Finish demo_app in chapter2