Updated for Phase 2