Added switch/case blocks