teamplates tweaked