updating my switch statement