fixing team organization