Added extra case
Added extra cases
Added extra case
Added generator, extra cases