Updated demo no-db