Final commit Phase 1