diff --git a/packages/presence.yaml b/packages/presence.yaml
index 94edf9b..e27e6c6 100644
--- a/packages/presence.yaml
+++ b/packages/presence.yaml
@@ -122,6 +122,8 @@ sensor:
           {% set person = states.person.kallen_stork.state %}
           {% if person in ['Home','home'] %}
             Home
+          {% elif person in ['School','Elementary School','High School'] %}
+            School
           {% elif person in ['WalMart','Wal-Mart','Kroger','Chief','Meijer','Dollar General - Clinton St','Aldi'] %}
             Grocery Store
           {% elif person in ['Rite Aid'] %}
@@ -228,15 +230,15 @@ automation:
       - entity_id: person.tony_stork
         event: leave
         platform: zone
-        zone: zone.school
+        zone: zone.elementary_school
       - entity_id: person.christina_stork
         event: leave
         platform: zone
-        zone: zone.school
+        zone: zone.elementary_school
       - entity_id: person.kallen_stork
         event: enter
         platform: zone
-        zone: zone.school
+        zone: zone.elementary_school
     condition:
       - condition: time
         before: "11:30:00"
@@ -271,15 +273,15 @@ automation:
       - entity_id: person.tony_stork
         event: leave
         platform: zone
-        zone: zone.school
+        zone: zone.elementary_school
       - entity_id: person.christina_stork
         event: leave
         platform: zone
-        zone: zone.school
+        zone: zone.elementary_school
       - entity_id: person.kallen_stork
         event: leave
         platform: zone
-        zone: zone.school
+        zone: zone.elementary_school
     condition:
       - condition: time
         after: "11:30:02"