Phase 2 complited
Output formatting remaining