removed questiterator
removed questiterator
merge