Updated roster from code review