Changed the If/Else Statements to Switch Statements