added switch question functionallity