Added input switch