Added switch statements