Added_conditions_for_different_types_of_entities #217