team2 done for v2.0
bug fixed master and team2 merged