New people to team and other changes
Merge