Updated all the previous switch statements to use the new switch function