diff --git a/automation/presence.yaml b/automation/presence.yaml
index 9b28a9f..013ee9c 100644
--- a/automation/presence.yaml
+++ b/automation/presence.yaml
@@ -47,38 +47,25 @@
   action:
   - service: script.family_is_home
 
-#- alias: Family Devices Have Left
-#  trigger:
-#  - entity_id: group.family
-#    from: home
-#    platform: state
-#    to: not_home
-#  condition:
-#  - condition: state
-#    entity_id: sensor.family_status
-#    state: 'home'
-#  action:
-#  - service: script.family_is_away
-
-- alias: Jeff Arrives Home
-  trigger:
-  # - entity_id: device_tracker.owntracks_jeffreystonesiphone
-  #   event: enter
-  #   platform: zone
-  #   zone: zone.home
-  - entity_id: sensor.jeff_presence
-    from: 'not present'
-    platform: state
-    to: 'present'
-  action:
-  - service: script.jeff_destination_arrived
-  - service: script.driveway_on
-  - service: input_boolean.turn_off
-    entity_id: input_boolean.jeff_heading_home
+# - alias: Jeff Arrives Home
+#   trigger:
+#   # - entity_id: device_tracker.owntracks_jeffreystonesiphone
+#   #   event: enter
+#   #   platform: zone
+#   #   zone: zone.home
+#   - entity_id: sensor.jeff_presence
+#     from: 'not present'
+#     platform: state
+#     to: 'present'
+#   action:
+#   - service: script.jeff_destination_arrived
+#   - service: script.driveway_on
+#   - service: input_boolean.turn_off
+#     entity_id: input_boolean.jeff_heading_home
  
 - alias: Jeff Arrives At Summit
   trigger:
-  - entity_id: device_tracker.owntracks_jeffreystonesiphone
+  - entity_id: device_tracker.jeffrey_377fadfe9d7e410fb71bd84c06547c00
     event: enter
     platform: zone
     zone: zone.summit
@@ -88,7 +75,7 @@
 
 - alias: Kat Arrives Home Notification
   trigger:
-  - entity_id: device_tracker.katherinestonesiphone
+  - entity_id: device_tracker.kat_2f1c672110dd491ea7dca9833d1c6cf5
     event: enter
     platform: zone
     zone: zone.home
@@ -103,7 +90,7 @@
   - platform: zone
     event: enter
     zone: zone.zoo_atlanta
-    entity_id: device_tracker.katherinestonesiphone
+    entity_id: device_tracker.kat_2f1c672110dd491ea7dca9833d1c6cf5
   condition:
   - condition: state
     entity_id: input_boolean.text_notify_jeff
@@ -118,14 +105,11 @@
   - platform: zone
     event: leave
     zone: zone.zoo_atlanta
-    entity_id: device_tracker.katherinestonesiphone
+    entity_id: device_tracker.kat_2f1c672110dd491ea7dca9833d1c6cf5
   condition:
   - condition: state
     entity_id: input_boolean.text_notify_jeff
     state: 'on'
   action:
-  #- service: notify.ios_jeffreystonesiphone
-  #  data:
-  #    message: Kat left Zoo Atlanta
   - service: input_boolean.turn_on
     entity_id: input_boolean.kat_heading_home
diff --git a/automation/transit.yaml b/automation/transit.yaml
index 642f10e..d203c47 100644
--- a/automation/transit.yaml
+++ b/automation/transit.yaml
@@ -10,38 +10,6 @@
     entity_id: sensor.jeff_destination
     to: Home
   action:
-  # - service: notify.ios_katherinestonesiphone
-  #   data:
-  #     message: Jeff will be home in {{states.sensor.jeff_ett_home.attributes.duration_in_traffic}}.
   - service: input_boolean.turn_on
     entity_id: input_boolean.jeff_heading_home
 
-- alias: Jeff no destination
-  trigger:
-  - platform: state
-    entity_id: sensor.jeff_status
-    to: 'moving'
-  condition:
-  - condition: state
-    entity_id: sensor.jeff_destination
-    state: Arrived
-  action:
-  - service: script.jeff_destination_na
-
-- alias: Jeff is stationary
-  trigger:
-  - platform: numeric_state
-    entity_id: sensor.jeff_velocity
-    below: 1
-  action:
-  - service: script.jeff_is_stationary
-
-- alias: Jeff is moving
-  trigger:
-  - platform: numeric_state
-    entity_id: sensor.jeff_velocity
-    above: 0
-  action:
-  - service: script.jeff_is_moving
-
-
diff --git a/scripts/jeff_is_home.yaml b/scripts/jeff_is_home.yaml
new file mode 100644
index 0000000..8b34878
--- /dev/null
+++ b/scripts/jeff_is_home.yaml
@@ -0,0 +1,7 @@
+jeff_is_home:
+  sequence:
+    - service: script.jeff_destination_arrived
+    - service: script.driveway_on
+    - service: input_boolean.turn_off
+      entity_id: input_boolean.jeff_heading_home 
+    - service: script.jeff_is_home_audible
diff --git a/scripts/kat_is_home_audible.yaml b/scripts/kat_is_home_audible.yaml
index 5a86c41..1aea79f 100644
--- a/scripts/kat_is_home_audible.yaml
+++ b/scripts/kat_is_home_audible.yaml
@@ -3,6 +3,9 @@ kat_is_home_audible:
     - condition: state
       entity_id: input_boolean.audible_notifications
       state: "on"
+    - condition: state
+      entity_id: sensor.jeff_presence
+      state: 'present'
     - service: tts.google_say
       data:
         entity_id: media_player.hass_speaker