added working case 2; moved case 1 to exceute last until switch statement added