enhanced the demo app