Moving the questions into a partial