Rearrange to match order of questions