Update demo to match new functionality