Final Commit of Phase 2