Fixed up some of QuestionDOA. Make sure you...

Make sure you adjust the method calls as some of them have been changed.