Rebuild Phase 2