Modified for local testing
Added teams