Improvement to Question/Edit