some more work on DemoApp