removed switchCase