upgrade following to use sets+discussion