Updated demo app