Changed the way questions are presented