Phase1 + phase2 update