Added nicky to team, changed parameter ordering of team-member mixin