Collaborators changes

Some changes that I want to review.