added switcher to simulation