added teams and other stuff