Added extra scenarios