revamped even more to allow adding more teams