Chnages to Question and Answer