Made TeamMaker more efficent