Updated demo
Updated demo app