Rearrangement of questions
Minor changes