Refactor and introduce attendees