Some changes needed for Phase 3