Update demo with latest changes to main codebase