Added switch and HDMI