added popup switcher