2nd pass of demo_app