Added switch statement