changed logic of variants