Added port switching