Added 3 other switch statements