Changed to switch-case