Make the swich cases more speciffic