Adjusting phase2 setup