Updated Questioning system