Updated for 'multiple variants'