diff --git a/config/packages/presence.yaml b/config/packages/presence.yaml
index 14bf583..911b43d 100755
--- a/config/packages/presence.yaml
+++ b/config/packages/presence.yaml
@@ -118,23 +118,21 @@ sensor:
     sensors:
       jeff_home:
         value_template: >-
-          {{ is_state('device_tracker.jeffreystonesiphone', 'home')
-             or is_state('device_tracker.hass_jeffsiphone', 'home')
+          {{ is_state('device_tracker.jeffreys_iphone_2', 'home')
              or is_state('device_tracker.life360_jeffrey_stone', 'home') }}
   - platform: template
     sensors:
       kat_home:
         value_template: >-
-          {{ is_state('device_tracker.iphone', 'home')
+          {{ is_state('device_tracker.iphone_4', 'home')
              or is_state('device_tracker.life360_kat_stone', 'home') }}
   - platform: template
     sensors:
       family_home:
         value_template: >-
-          {{ is_state('device_tracker.jeffreystonesiphone', 'home')
-             or is_state('device_tracker.hass_jeffsiphone', 'home')
+          {{ is_state('device_tracker.jeffreys_iphone_2', 'home')
              or is_state('device_tracker.life360_jeffrey_stone', 'home') 
-             or is_state('device_tracker.iphone', 'home')
+             or is_state('device_tracker.iphone_4', 'home')
              or is_state('device_tracker.life360_kat_stone', 'home') 
              or is_state('sensor.family_status', 'Home') }}
 
diff --git a/config/scripts/general.yaml b/config/scripts/general.yaml
index 43438ae..bb124dc 100755
--- a/config/scripts/general.yaml
+++ b/config/scripts/general.yaml
@@ -90,6 +90,15 @@ family_is_home:
       topic: house/family/status
       payload_template: Home
       retain: true
+  - service: script.vacation_canceled
+  - service: script.appliances_on
+  - service: script.standby
+  - service: script.washer_finished_notification_audible
+  - service: alarm_control_panel.aarlo_set_mode
+    data:
+      entity_id: alarm_control_panel.aarlo_ah_base_station
+      mode: 'home'
+  - service: script.family_is_home
 
 family_is_away:
   sequence:
@@ -101,6 +110,19 @@ family_is_away:
       topic: house/family/status
       payload_template: Away
       retain: true
+  - service: script.appliances_off
+  - service: scene.turn_on
+    entity_id: scene.lights_out
+  - service: script.security_check_garage
+  - service: script.security_check_zones
+  - service: script.lockdown
+  - service: script.lockdown_issue
+  - service: script.all_fans_off
+  - service: alarm_control_panel.aarlo_set_mode
+    data: 
+      entity_id: alarm_control_panel.aarlo_ah_base_station
+      mode: 'Armed'
+  - service: script.family_is_away
 
 driveway_on:
   sequence:
diff --git a/config/sensors/google_travel_time.yaml b/config/sensors/google_travel_time.yaml
index e4280c3..343bf0b 100755
--- a/config/sensors/google_travel_time.yaml
+++ b/config/sensors/google_travel_time.yaml
@@ -1,13 +1,13 @@
 - platform: waze_travel_time
   name: "Jeff ETT Home"
   #api_key: !secret google_api
-  origin: device_tracker.jeffreystonesiphone
+  origin: device_tracker.jeffreys_iphone_2
   destination: zone.home
   region: 'US'
 - platform: waze_travel_time
   name: "Kat ETT Home"
   #api_key: !secret google_api
-  origin: device_tracker.iphone
+  origin: device_tracker.iphone_4
   destination: zone.home
   region: 'US'
 - platform: waze_travel_time