Issue #36: updated important concepts