Working version without the people who were causing problems