Better handling of who is on what team