Changes to Team bootstrapping based on review