Added switch input