Added switch