add team support
minor fix