Added switch section