made the question generation flexible