updates for team view
merge