team2 done for v2.0