=> First commit of Phase 2