Assign teams to prevent exclusion

Assign teams to prevent exclusion