Updated demo build