Change to Question class (problems with back issues)