more changes to phase2