diff --git a/README.md b/README.md
index f4bbfc9a..878abde4 100644
--- a/README.md
+++ b/README.md
@@ -1,5 +1,4 @@
-# Pokemon Moveset Ontology
-## Ontology Engineering
+# Ontology Engineering
 
 <br />
 
diff --git a/oe2022/dog-breed-ontology/catalog-v001.xml b/oe2022/dog-breed-ontology/catalog-v001.xml
index 9692dc05..5dce5e68 100644
--- a/oe2022/dog-breed-ontology/catalog-v001.xml
+++ b/oe2022/dog-breed-ontology/catalog-v001.xml
@@ -1,27 +1,34 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<catalog prefer="public" xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
-    <uri id="Imports Wizard Entry" name="http://semanticscience.org/ontology/sio/v1.54/sio-release.owl" uri="sio-release.owl"/>
-    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/AnnotationVocabulary/" uri="../Commons/AnnotationVocabulary.rdf"/>
-    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/Classifiers/" uri="../Commons/Classifiers.rdf"/>
-    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/CodesAndCodeSets/" uri="../Commons/CodesAndCodeSets.rdf"/>
-    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/Collections/" uri="../Commons/Collections.rdf"/>
-    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/ContextualDesignators/" uri="../Commons/ContextualDesignators.rdf"/>
-    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/ContextualIdentifiers/" uri="../Commons/ContextualIdentifiers.rdf"/>
-    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/DatesAndTimes/" uri="../Commons/DatesAndTimes.rdf"/>
-    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/Designators/" uri="../Commons/Designators.rdf"/>
-    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/Documents/" uri="../Commons/Documents.rdf"/>
-    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/Identifiers/" uri="../Commons/Identifiers.rdf"/>
-    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/MappingDatesAndTimesToOWLTime/" uri="../Commons/MappingDatesAndTimesToOWLTime.rdf"/>
-    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/PartiesAndSituations/" uri="../Commons/PartiesAndSituations.rdf"/>
-    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/ProductsAndServices/" uri="../Commons/ProductsAndServices.rdf"/>
-    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/QuantitiesAndUnits/" uri="../Commons/QuantitiesAndUnits.rdf"/>
-    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/RegistrationAuthorities/" uri="../Commons/RegistrationAuthorities.rdf"/>
-    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/RegulatoryAgencies/" uri="../Commons/RegulatoryAgencies.rdf"/>
-    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/TextDatatype/" uri="../Commons/TextDatatype.rdf"/>
-    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/LCC/Countries/CountryRepresentation/" uri="../LCC/Countries/CountryRepresentation.rdf"/>
-    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/LCC/Countries/ISO3166-1-CountryCodes/" uri="../LCC/Countries/ISO3166-1-CountryCodes.rdf"/>
-    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/LCC/Languages/ISO639-1-LanguageCodes/" uri="../LCC/Languages/ISO639-1-LanguageCodes.rdf"/>
-    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/LCC/Languages/ISO639-2-LanguageCodes/" uri="../LCC/Languages/ISO639-2-LanguageCodes.rdf"/>
-    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/LCC/Languages/LanguageRepresentation/" uri="../LCC/Languages/LanguageRepresentation.rdf"/>
-    <uri id="User Entered Import Resolution" name="https://tw.rpi.edu/ontology-engineering/oe2022/find-a-pet/" uri="./find-a-pet.rdf"/>
-</catalog>
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<catalog prefer="public" xmlns="urn:oasis:names:tc:entity:xmlns:xml:catalog">
+    <uri id="User Entered Import Resolution" name="http://www.w3.org/ns/prov-o-20130430" uri="files/prov-o.rdf"/>
+    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/AnnotationVocabulary/" uri="../Commons/AnnotationVocabulary.rdf"/>
+    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/Assessments/" uri="../Commons/Assessments.rdf"/>
+    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/Classifiers/" uri="../Commons/Classifiers.rdf"/>
+    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/CodesAndCodeSets/" uri="../Commons/CodesAndCodeSets.rdf"/>
+    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/Collections/" uri="../Commons/Collections.rdf"/>
+    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/ContextualDesignators/" uri="../Commons/ContextualDesignators.rdf"/>
+    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/ContextualIdentifiers/" uri="../Commons/ContextualIdentifiers.rdf"/>
+    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/DatesAndTimes/" uri="../Commons/DatesAndTimes.rdf"/>
+    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/Designators/" uri="../Commons/Designators.rdf"/>
+    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/Documents/" uri="../Commons/Documents.rdf"/>
+    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/Identifiers/" uri="../Commons/Identifiers.rdf"/>
+    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/MappingDatesAndTimesToOWLTime/" uri="../Commons/MappingDatesAndTimesToOWLTime.rdf"/>
+    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/Occurrences/" uri="../Commons/Occurrences.rdf"/>
+    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/PartiesAndSituations/" uri="../Commons/PartiesAndSituations.rdf"/>
+    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/ProductsAndServices/" uri="../Commons/ProductsAndServices.rdf"/>
+    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/QuantitiesAndUnits/" uri="../Commons/QuantitiesAndUnits.rdf"/>
+    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/Ratings/" uri="../Commons/Ratings.rdf"/>
+    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/RegistrationAuthorities/" uri="../Commons/RegistrationAuthorities.rdf"/>
+    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/RegulatoryAgencies/" uri="../Commons/RegulatoryAgencies.rdf"/>
+    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/Commons/TextDatatype/" uri="../Commons/TextDatatype.rdf"/>
+    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/LCC/Countries/CountryRepresentation/" uri="../LCC/Countries/CountryRepresentation.rdf"/>
+    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/LCC/Countries/ISO3166-1-CountryCodes/" uri="../LCC/Countries/ISO3166-1-CountryCodes.rdf"/>
+    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/LCC/Languages/ISO639-1-LanguageCodes/" uri="../LCC/Languages/ISO639-1-LanguageCodes.rdf"/>
+    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/LCC/Languages/ISO639-2-LanguageCodes/" uri="../LCC/Languages/ISO639-2-LanguageCodes.rdf"/>
+    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/LCC/Languages/LanguageRepresentation/" uri="../LCC/Languages/LanguageRepresentation.rdf"/>
+    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/LCC/Countries/ISO3166-2-SubdivisionCodes/" uri="../LCC/Countries/ISO3166-2-SubdivisionCodes.rdf"/>
+    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/LCC/Countries/UN-M49-RegionCodes/" uri="../LCC/Countries/UN-M49-RegionCodes.rdf"/>
+    <uri id="User Entered Import Resolution" name="https://www.omg.org/spec/LCC/Countries/Regions/ISO3166-2-SubdivisionCodes-US/" uri="../LCC/Countries/Regions/ISO3166-2-SubdivisionCodes-US.rdf"/>
+    <uri id="User Entered Import Resolution" name="https://tw.rpi.edu/ontology-engineering/oe2022/find-a-pet/" uri="./find-a-pet.rdf"/>
+    <uri id="User Entered Import Resolution" name="https://tw.rpi.edu/ontology-engineering/oe2022/find-a-pet-individuals/" uri="./find-a-pet-individuals.rdf"/>
+</catalog>
diff --git a/oe2022/dog-breed-ontology/index.md b/oe2022/dog-breed-ontology/index.md
index 3c953751..35fee55f 100644
--- a/oe2022/dog-breed-ontology/index.md
+++ b/oe2022/dog-breed-ontology/index.md
@@ -27,7 +27,7 @@ It may be that the user is unsatisfied with the results, either because they do
 
 Ashley Choi: <choia5@rpi.edu>
 
-Debjani Ray-Majumder
+Debjani Ray-Majumder: <raymad@rpi.edu>
 
 Danielle Villa: <villad4@rpi.edu>
 
diff --git a/oe2022/dog-breed-ontology/ontology.md b/oe2022/dog-breed-ontology/ontology.md
index 4af528a1..dba9da3c 100644
--- a/oe2022/dog-breed-ontology/ontology.md
+++ b/oe2022/dog-breed-ontology/ontology.md
@@ -2,14 +2,55 @@
 
 ## Conceptual Model
 
-<iframe src="files/ConceptualModel_v1.pdf" style="width: 100%;height: 700px;border: none;"></iframe>
+The most recent full version of our conceptual model is available as a [drawio file](files/ConceptualModel_v7.drawio).
+The ontology is split into two main parts: describing the breeds, and describing the potential adopters. Our scope is limited to the United States, so we only consider breeds that are recognized by the American Kennel Club and are only model characteristics of dog adopters in the United States. Below is an overview of our conceptual model.
+
+In our conceptual models the colors denote different type of entities:
+- white: class that we created
+- grey: class that we imported from another ontology
+- light blue: object property that we created, connected to the arrow that show the classes in the relation and any cardinality restrictions
+- dark blue: object property that we imported from another ontology
+- red: data value, shown is its datatype
+
+The names without boxes along arrows are data properties.
+
+#### Breeds
+
+<img style="float: center;" src="images/ConceptualModel_BreedTypes.png"/>
+Our ontology models dog breeds and classifies them based on what potential adopters might require or prefer. These are the types of breeds that our system can infer. Some of these are disjoint so help with reasoning speed (hypoallergenic vs. likely allergenic) and others are disjoint because their definitions do not allow for overlap (cold climate appropriate vs. hot climate appropriate).  Since each of these subclasses are defined, they can be inferred from a breed's relation to various breed aspects. Every breed will be inferred to be either hypoallergenic or likely allergenic, and either hairy or hairless. 
+<img style="float: center;" src="images/ConceptualModel_BreedCharacteristics.png"/>
+While every dog is unique, those that are the same breed share many characteristics. Breeds tend to look very similar and often act in similar ways as well. We consider physical characteristics such as weight (included in breed physical profile), behavioral characteristics such as playfulness (included in breed characteristic profile), and extrinsic characteristics such as popularity. Some characteristics such as coat type and coat length are used to infer other aspects of the breed, such as if it's hot or cold tolerant. Other relations, such as a breed's relation to an allergy, allow us to determine whether a breed is considered hypoallergenic. The allergy that we were most concerned about was an allergy to dog dander or fur, which is an instance in our system. We also consider some characteristics of breeds that the system considers optional, such as if an adopter has a preferred color of dog. Many of these are considered breed aspects since they describe the tendencies of the breed as a group. 
+<img style="float: center;" src="images/ConceptualModel_Ratings.png"/>
+We cannot model cuteness, since that's subjective. We instead model the popularity rankings for each breed. Popularity is not based just on how cute people find a dog, since dogs may also be popular because they are easy to care for and have a lot of information available on them, but dogs that are largely considered 'ugly' are less likely to be popular. We reuse the Commons Ratings ontology to model this. Due to scope we only include rankings from the AKC in 2021, with the smaller rankings (1st, 2nd) being more popular than larger rankings (40th, 41st).  
+
+#### Potential Adopter
+
+<img style="float: center;" src="images/ConceptualModel_Adopter.png"/>
+The above diagram shows how we model potential adopters. We chose the name 'potential adopter' because while they may want to adopter a new dog, they have not done so yet and may change their mind. Potential adopter is a role that either a family or an individual can play. Some aspects are related to the individual adopter/members of the adopter family, such as exercise level, while others are related to the party that is playing the role of potential adopter, such as budget. We separated those families that included children under 5 years old from those that do not. People may be small children, students, or elderly. People may also have an allergy, but we consider the entire party having a single primary residence that a dog would spend most of its time.  
+<img style="float: center;" src="images/ConceptualModel_FunctionalRoles.png"/>
+Some adopters may want a dog for a certain purpose, such as herding, and most breeds were bred for a certain purpose, such as hunting. Additionally, breeds are sorted into breed groups that describe the primary purpose the breed was bred to serve. We modeled those purposes as functional roles, and added categories for the most common purposes that dogs were bred for and serve. Due to scope limitations we only included the official AKC breed groups as instances. Since it’s not guaranteed to be good at the purpose it’s bred for (since most dogs are not working dogs in the US) this is an optional requirement of the system and overall trainability is prioritized.
 
 ### Previous Versions
 
+- [Version 7 (OE 13)](files/ConceptualModel_v7.pdf) [SVG](files/ConceptualModel_v7.svg) CURRENT
+- [Version 6 (OE 12)](files/ConceptualModel_v6.pdf) [SVG](files/ConceptualModel_v6.svg)
+- [Version 5 (OE 10)](files/ConceptualModel_v5.pdf) [SVG](files/ConceptualModel_v5.svg) 
+- [Version 4 (OE 9)](files/ConceptualModel_v4.pdf) [SVG](files/ConceptualModel_v4.svg)
+- [Version 3 (OE 8)](files/ConceptualModel_v3.pdf)
+- [Version 2 (OE 6)](files/ConceptualModel_v2.pdf)
 - [Version 1 (OE 5)](files/ConceptualModel_v1.pdf)
 
 ## Ontologies
 
+- [Version 8 (OE 13)](https://raw.githubusercontent.com/tetherless-world/ontology-engineering/3db93d1b10911829c64fb1d1fda0dd4b033ac006/oe2022/dog-breed-ontology/find-a-pet.rdf) [Large Individuals](https://github.com/tetherless-world/ontology-engineering/raw/c78b8c60b6f6687c8d719997c7fe1d45fb20c664/oe2022/dog-breed-ontology/find-a-pet-individuals.rdf) [Small Individuals](https://raw.githubusercontent.com/tetherless-world/ontology-engineering/411a147b864f13eecf2c84701550626bf3190622/oe2022/dog-breed-ontology/find-a-pet-individuals-small.rdf) CURRENT
+- [Version 7 (OE 12)](https://raw.githubusercontent.com/tetherless-world/ontology-engineering/c4c5af171820eedcb7108cc069a69637fe25a02a/oe2022/dog-breed-ontology/find-a-pet.rdf) [Large Individuals](https://github.com/tetherless-world/ontology-engineering/raw/c4c5af171820eedcb7108cc069a69637fe25a02a/oe2022/dog-breed-ontology/find-a-pet-individuals.rdf) [Small Individuals](https://raw.githubusercontent.com/tetherless-world/ontology-engineering/c4c5af171820eedcb7108cc069a69637fe25a02a/oe2022/dog-breed-ontology/find-a-pet-individuals-small.rdf) 
+- [Version 6 (OE 11)](https://raw.githubusercontent.com/tetherless-world/ontology-engineering/68ee5cc09ddc8a4af8b5d85b31565d2733f38613/oe2022/dog-breed-ontology/find-a-pet.rdf) [Individuals](https://github.com/tetherless-world/ontology-engineering/raw/68ee5cc09ddc8a4af8b5d85b31565d2733f38613/oe2022/dog-breed-ontology/find-a-pet-individuals.rdf) 
+- [Version 5 (OE 10)](https://raw.githubusercontent.com/tetherless-world/ontology-engineering/c1f3e28aecb3212c01b1f88fa362049ae3272d31/oe2022/dog-breed-ontology/find-a-pet.rdf) [Individuals](https://raw.githubusercontent.com/tetherless-world/ontology-engineering/c1f3e28aecb3212c01b1f88fa362049ae3272d31/oe2022/dog-breed-ontology/find-a-pet-individuals.rdf)
+- [Version 4 (OE 9)](https://raw.githubusercontent.com/tetherless-world/ontology-engineering/006ce23f62757847531bcb106831490d4c43f14b/oe2022/dog-breed-ontology/find-a-pet.rdf) [Individuals](https://raw.githubusercontent.com/tetherless-world/ontology-engineering/006ce23f62757847531bcb106831490d4c43f14b/oe2022/dog-breed-ontology/find-a-pet-individuals.rdf)
+- [Version 3 (OE 8)](https://raw.githubusercontent.com/tetherless-world/ontology-engineering/c65013f0f13175273378c6a35a18031150a03e32/oe2022/dog-breed-ontology/find-a-pet.rdf) [Individuals](https://raw.githubusercontent.com/tetherless-world/ontology-engineering/c65013f0f13175273378c6a35a18031150a03e32/oe2022/dog-breed-ontology/find-a-pet-individuals.rdf) 
+- [Version 2 (OE 7)](https://raw.githubusercontent.com/tetherless-world/ontology-engineering/3ffedc3e1063ee3ddeb0f233c9d43d29989e17bc/oe2022/dog-breed-ontology/find-a-pet.rdf)
+- [Version 1 (OE 6)](https://raw.githubusercontent.com/tetherless-world/ontology-engineering/40b9433c732a6adc31d5fb0dd1c953f172dbd228/oe2022/dog-breed-ontology/find-a-pet.rdf) 
+
 ## Ontologies Reused
 - [OMG Annotation Vocabulary v.2022-08-01](https://www.omg.org/spec/Commons/20220801/AnnotationVocabulary/)
 - [OMG Classifiers v.2022-08-01](https://www.omg.org/spec/Commons/20220801/Classifiers/)
diff --git a/oe2022/dog-breed-ontology/termlist.md b/oe2022/dog-breed-ontology/termlist.md
index a9e06981..f2ad713a 100644
--- a/oe2022/dog-breed-ontology/termlist.md
+++ b/oe2022/dog-breed-ontology/termlist.md
@@ -5,10 +5,14 @@ title: term list
 
 ## Terminology List
 
-<iframe src="https://docs.google.com/spreadsheets/d/e/2PACX-1vRpmP_Bnvo-fPIpOjKxkti6euMjZmOWC8MbQYG16gJvv9A_6ZH6Vy9A1awbjk0xAw/pubhtml?widget=true&amp;headers=false" style="width: 100%;height: 700px;border: none;"></iframe>
+<iframe src="https://docs.google.com/spreadsheets/d/e/2PACX-1vSqKHVQhTRFSDXbaGWi8sE2LQv1Vg8DwICHTVN-j9JgG4UqOcW3DlRtylO1mcTZeQ/pubhtml?widget=true&amp;headers=false" style="width: 100%;height: 700px;border: none;"></iframe>
 
 ## Previous Versions
 
+- [Version 7 (OE 13)](files/TermList_v7.xlsx) CURRENT
+- [Version 6 (OE 10)](files/TermList_v6.xlsx) 
+- [Version 5 (OE 8)](files/TermList_v5.xlsx) 
+- [Version 4 (OE 6)](files/TermList_v4.xlsx)
 - [Version 3 (OE 5)](files/TermList_v3.xlsx)
 - [Version 2 (OE 4 final)](files/TermList_v2.xlsx)
 - [Version 1 (OE 4 init)](files/TermList_v1.xlsx)
diff --git a/oe2022/dog-breed-ontology/usecase.md b/oe2022/dog-breed-ontology/usecase.md
index 28065473..04da699b 100644
--- a/oe2022/dog-breed-ontology/usecase.md
+++ b/oe2022/dog-breed-ontology/usecase.md
@@ -5,9 +5,13 @@ title: use case
 
 ## Use Case Document
 
-<iframe src="files/UseCase_v2.pdf" style="width: 100%;height: 700px;border: none;"></iframe>
+<iframe src="files/UseCase_v6.pdf" style="width: 100%;height: 700px;border: none;"></iframe>
 
 ## Previous Versions
 
+- [Version 6 (OE 13)](files/UseCase_v6.pdf) CURRENT
+- [Version 5 (OE 10)](files/UseCase_v5.pdf)
+- [Version 4 (OE 8)](files/UseCase_v4.pdf) 
+- [Version 3 (OE 6)](files/UseCase_v3.pdf)
 - [Version 2 (OE 5)](files/UseCase_v2.pdf)
 - [Version 1 (OE 4)](files/UseCase_v1.pdf)
diff --git a/oe2022/indoor-environment-manager/indoor-environment-manager-individuals.rdf b/oe2022/indoor-environment-manager/indoor-environment-manager-individuals.rdf
index 07198bbc..854812bc 100644
--- a/oe2022/indoor-environment-manager/indoor-environment-manager-individuals.rdf
+++ b/oe2022/indoor-environment-manager/indoor-environment-manager-individuals.rdf
@@ -103,7 +103,6 @@
 		<rdf:type rdf:resource="&oe2022-iem;OutdoorEnvironment"/>
 		<oe2022-iem:hasAirTemperatureSign rdf:resource="&oe2022-iem;Negative"/>
 		<oe2022-iem:hasAirTemperatureValue rdf:datatype="&xsd;integer">18</oe2022-iem:hasAirTemperatureValue>
-		<oe2022-iem:hasAttribute rdf:resource="&oe2022-iem-ind;Question2IndoorOutdoorTemperatureDelta"/>
 		<oe2022-iem:hasNumericAirTemperatureValue rdf:datatype="&xsd;integer">18</oe2022-iem:hasNumericAirTemperatureValue>
 		<oe2022-iem:isOutsideOf rdf:resource="&oe2022-iem-ind;Question2Room"/>
 	</owl:NamedIndividual>
@@ -148,6 +147,7 @@
 	
 	<owl:NamedIndividual rdf:about="&oe2022-iem-ind;Question2Room">
 		<rdf:type rdf:resource="&oe2022-iem;Room"/>
+		<oe2022-iem:hasCurrentIndoorEnvironment rdf:resource="&oe2022-iem-ind;Question2EnvironmentCurrent"/>
 	</owl:NamedIndividual>
 	
 	<owl:NamedIndividual rdf:about="&oe2022-iem-ind;Question2SpaceHeater">
@@ -255,10 +255,6 @@
 		<oe2022-iem:hasAirQualityValue rdf:datatype="&xsd;integer">34</oe2022-iem:hasAirQualityValue>
 		<oe2022-iem:hasAirSpeedValue rdf:datatype="&xsd;decimal">1.2</oe2022-iem:hasAirSpeedValue>
 		<oe2022-iem:hasAirTemperatureValue rdf:datatype="&xsd;integer">89</oe2022-iem:hasAirTemperatureValue>
-		<oe2022-iem:hasAttribute rdf:resource="&oe2022-iem-ind;Question4IndoorOutdoorAirSpeedDelta"/>
-		<oe2022-iem:hasAttribute rdf:resource="&oe2022-iem-ind;Question4IndoorOutdoorHumidityDelta"/>
-		<oe2022-iem:hasAttribute rdf:resource="&oe2022-iem-ind;Question4IndoorOutdoorTemperatureDelta"/>
-		<oe2022-iem:hasAttribute rdf:resource="&oe2022-iem-ind;Question4OutdoorAirQuality"/>
 		<oe2022-iem:hasNumericAirQualityValue rdf:datatype="&xsd;integer">34</oe2022-iem:hasNumericAirQualityValue>
 		<oe2022-iem:hasNumericAirSpeedValue rdf:datatype="&xsd;integer">1</oe2022-iem:hasNumericAirSpeedValue>
 		<oe2022-iem:hasNumericAirTemperatureValue rdf:datatype="&xsd;integer">89</oe2022-iem:hasNumericAirTemperatureValue>
@@ -317,6 +313,7 @@
 	
 	<owl:NamedIndividual rdf:about="&oe2022-iem-ind;Question4Room">
 		<rdf:type rdf:resource="&oe2022-iem;Room"/>
+		<oe2022-iem:hasCurrentIndoorEnvironment rdf:resource="&oe2022-iem-ind;Question4EnvironmentCurrent"/>
 	</owl:NamedIndividual>
 	
 	<owl:NamedIndividual rdf:about="&oe2022-iem-ind;Question4Thermostat">
@@ -426,6 +423,10 @@
 	
 	<owl:NamedIndividual rdf:about="&oe2022-iem-ind;Question5Room">
 		<rdf:type rdf:resource="&oe2022-iem;Room"/>
+		<oe2022-iem:hasCurrentIndoorEnvironment rdf:resource="&oe2022-iem-ind;Question5EnvironmentCurrent"/>
+		<oe2022-iem:hasOccupant rdf:resource="&oe2022-iem-ind;Question5Occupant1"/>
+		<oe2022-iem:hasOccupant rdf:resource="&oe2022-iem-ind;Question5Occupant2"/>
+		<oe2022-iem:hasOccupant rdf:resource="&oe2022-iem-ind;Question5Occupant3"/>
 	</owl:NamedIndividual>
 	
 	<owl:NamedIndividual rdf:about="&oe2022-iem-ind;Question5Thermostat">
@@ -476,6 +477,7 @@
 	
 	<owl:NamedIndividual rdf:about="&oe2022-iem-ind;Question6Room">
 		<rdf:type rdf:resource="&oe2022-iem;Room"/>
+		<oe2022-iem:hasCurrentIndoorEnvironment rdf:resource="&oe2022-iem-ind;Question6EnvironmentCurrent"/>
 		<oe2022-iem:hasOccupant rdf:resource="&oe2022-iem-ind;Question6Occupant1"/>
 	</owl:NamedIndividual>
 	
@@ -521,6 +523,7 @@
 	
 	<owl:NamedIndividual rdf:about="&oe2022-iem-ind;Question7Room">
 		<rdf:type rdf:resource="&oe2022-iem;Room"/>
+		<oe2022-iem:hasCurrentIndoorEnvironment rdf:resource="&oe2022-iem-ind;Question7EnvironmentCurrent"/>
 		<oe2022-iem:hasOccupant rdf:resource="&oe2022-iem-ind;Question7Occupant1"/>
 		<oe2022-iem:hasOccupant rdf:resource="&oe2022-iem-ind;Question7Occupant2"/>
 		<oe2022-iem:hasOccupant rdf:resource="&oe2022-iem-ind;Question7Occupant3"/>
diff --git a/oe2022/indoor-environment-manager/indoor-environment-manager.rdf b/oe2022/indoor-environment-manager/indoor-environment-manager.rdf
index ce0726fd..3eb4301e 100644
--- a/oe2022/indoor-environment-manager/indoor-environment-manager.rdf
+++ b/oe2022/indoor-environment-manager/indoor-environment-manager.rdf
@@ -285,11 +285,28 @@
 	</owl:Class>
 	
 	<owl:Class rdf:about="&oe2022-iem;Environment">
+		<rdfs:subClassOf>
+			<owl:Restriction>
+				<owl:onProperty rdf:resource="&oe2022-iem;hasAirQualityValue"/>
+				<owl:someValuesFrom>
+					<rdfs:Datatype>
+						<owl:onDatatype rdf:resource="&xsd;integer"/>
+						<owl:withRestrictions rdf:parseType="Collection">
+							<rdf:Description>
+								<xsd:minInclusive rdf:datatype="&xsd;integer">0</xsd:minInclusive>
+							</rdf:Description>
+							<rdf:Description>
+								<xsd:maxInclusive rdf:datatype="&xsd;integer">400</xsd:maxInclusive>
+							</rdf:Description>
+						</owl:withRestrictions>
+					</rdfs:Datatype>
+				</owl:someValuesFrom>
+			</owl:Restriction>
+		</rdfs:subClassOf>
 		<rdfs:subClassOf>
 			<owl:Restriction>
 				<owl:onProperty rdf:resource="&oe2022-iem;hasAirSpeedValue"/>
-				<owl:maxQualifiedCardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:maxQualifiedCardinality>
-				<owl:onDataRange>
+				<owl:someValuesFrom>
 					<rdfs:Datatype>
 						<owl:onDatatype rdf:resource="&xsd;integer"/>
 						<owl:withRestrictions rdf:parseType="Collection">
@@ -301,14 +318,13 @@
 							</rdf:Description>
 						</owl:withRestrictions>
 					</rdfs:Datatype>
-				</owl:onDataRange>
+				</owl:someValuesFrom>
 			</owl:Restriction>
 		</rdfs:subClassOf>
 		<rdfs:subClassOf>
 			<owl:Restriction>
 				<owl:onProperty rdf:resource="&oe2022-iem;hasAirTemperatureValue"/>
-				<owl:maxQualifiedCardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:maxQualifiedCardinality>
-				<owl:onDataRange>
+				<owl:someValuesFrom>
 					<rdfs:Datatype>
 						<owl:onDatatype rdf:resource="&xsd;integer"/>
 						<owl:withRestrictions rdf:parseType="Collection">
@@ -320,14 +336,13 @@
 							</rdf:Description>
 						</owl:withRestrictions>
 					</rdfs:Datatype>
-				</owl:onDataRange>
+				</owl:someValuesFrom>
 			</owl:Restriction>
 		</rdfs:subClassOf>
 		<rdfs:subClassOf>
 			<owl:Restriction>
 				<owl:onProperty rdf:resource="&oe2022-iem;hasRelativeHumidityValue"/>
-				<owl:maxQualifiedCardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:maxQualifiedCardinality>
-				<owl:onDataRange>
+				<owl:someValuesFrom>
 					<rdfs:Datatype>
 						<owl:onDatatype rdf:resource="&xsd;integer"/>
 						<owl:withRestrictions rdf:parseType="Collection">
@@ -339,7 +354,7 @@
 							</rdf:Description>
 						</owl:withRestrictions>
 					</rdfs:Datatype>
-				</owl:onDataRange>
+				</owl:someValuesFrom>
 			</owl:Restriction>
 		</rdfs:subClassOf>
 		<rdfs:label>environment</rdfs:label>
@@ -390,22 +405,6 @@
 	
 	<owl:Class rdf:about="&oe2022-iem;IndoorEnvironment">
 		<rdfs:subClassOf rdf:resource="&oe2022-iem;Environment"/>
-		<rdfs:subClassOf>
-			<owl:Restriction>
-				<owl:onProperty rdf:resource="&oe2022-iem;hasAirQualityValue"/>
-				<owl:onDataRange>
-					<rdfs:Datatype>
-						<owl:onDatatype rdf:resource="&xsd;integer"/>
-						<owl:withRestrictions rdf:parseType="Collection">
-							<rdf:Description>
-								<xsd:maxInclusive rdf:datatype="&xsd;integer">400</xsd:maxInclusive>
-							</rdf:Description>
-						</owl:withRestrictions>
-					</rdfs:Datatype>
-				</owl:onDataRange>
-				<owl:qualifiedCardinality rdf:datatype="&xsd;nonNegativeInteger">0</owl:qualifiedCardinality>
-			</owl:Restriction>
-		</rdfs:subClassOf>
 		<rdfs:subClassOf>
 			<owl:Restriction>
 				<owl:onProperty rdf:resource="&oe2022-iem;hasDaylightIntensityValue"/>
@@ -550,9 +549,8 @@
 		<rdfs:subClassOf rdf:resource="&oe2022-iem;Environment"/>
 		<rdfs:subClassOf>
 			<owl:Restriction>
-				<owl:onProperty rdf:resource="&oe2022-iem;hasDaylightIntensityValue"/>
-				<owl:maxQualifiedCardinality rdf:datatype="&xsd;nonNegativeInteger">1</owl:maxQualifiedCardinality>
-				<owl:onDataRange>
+				<owl:onProperty rdf:resource="&oe2022-iem;hasAirQualityValue"/>
+				<owl:someValuesFrom>
 					<rdfs:Datatype>
 						<owl:onDatatype rdf:resource="&xsd;integer"/>
 						<owl:withRestrictions rdf:parseType="Collection">
@@ -560,16 +558,16 @@
 								<xsd:minInclusive rdf:datatype="&xsd;integer">0</xsd:minInclusive>
 							</rdf:Description>
 							<rdf:Description>
-								<xsd:maxInclusive rdf:datatype="&xsd;integer">10000</xsd:maxInclusive>
+								<xsd:maxInclusive rdf:datatype="&xsd;integer">400</xsd:maxInclusive>
 							</rdf:Description>
 						</owl:withRestrictions>
 					</rdfs:Datatype>
-				</owl:onDataRange>
+				</owl:someValuesFrom>
 			</owl:Restriction>
 		</rdfs:subClassOf>
 		<rdfs:subClassOf>
 			<owl:Restriction>
-				<owl:onProperty rdf:resource="&oe2022-iem;hasAirQualityValue"/>
+				<owl:onProperty rdf:resource="&oe2022-iem;hasDaylightIntensityValue"/>
 				<owl:someValuesFrom>
 					<rdfs:Datatype>
 						<owl:onDatatype rdf:resource="&xsd;integer"/>
@@ -578,7 +576,7 @@
 								<xsd:minInclusive rdf:datatype="&xsd;integer">0</xsd:minInclusive>
 							</rdf:Description>
 							<rdf:Description>
-								<xsd:maxInclusive rdf:datatype="&xsd;integer">400</xsd:maxInclusive>
+								<xsd:maxInclusive rdf:datatype="&xsd;integer">10000</xsd:maxInclusive>
 							</rdf:Description>
 						</owl:withRestrictions>
 					</rdfs:Datatype>
@@ -728,10 +726,6 @@
 		<skos:example>Negative, Positive</skos:example>
 	</owl:Class>
 	
-	<owl:NamedIndividual rdf:about="&oe2022-iem;SingletonOutdoorEnvironment">
-		<rdf:type rdf:resource="&oe2022-iem;OutdoorEnvironment"/>
-	</owl:NamedIndividual>
-	
 	<owl:Class rdf:about="&oe2022-iem;SpaceHeater">
 		<rdfs:subClassOf rdf:resource="&oe2022-iem;PowerConsumingComponent"/>
 		<rdfs:label>space heater</rdfs:label>