V1 modified for bug
team2 work is completed