Some optimizations to OnJoinTeam
It works so beautifully :smile: