chenged switch-case statement