Bring over Mark's latest changes