Phase 3 commit

Phase 3 commit