4/25 fix bugs for phase2