Added switch but broken