Added Phases but need to fix