modified Question.java