Changed how questions are selected