Updated proposal for team organization