Commit all demo changes

Commit all demo changes