added switch option