Added in shuffling up of questions.