More work on team section