Refactored for Teams too.