All changes for demo Phase 2 committed