Updated demo application