Teams for flexibility

From C-7KDB897