Move from external team.js