updated demoApp, added some new functionality