added more options to switch statement