fixing phase2