Added questions and choices