Some updates after some attendee suggestions