diff --git a/README.md b/README.md
index 339ff6e8..55fdc80e 100755
--- a/README.md
+++ b/README.md
@@ -13,7 +13,7 @@ SSL via [SSLS](https://SSLS.com) - 5 Bucks A Year! - Keeps me safe!
 [HomeBridge](https://github.com/nfarina/homebridge) for full HA <-> Homekit compatibility.
 
 **Devices I have :**
-* [Ubiquiti Networks Unifi 802.11ac Pro](http://amzn.to/2mBSfE9) This keeps me warm with it's Wifi rays blanketing the house.
+* [Ubiquiti Networks Unifi 802.11ac Pro](http://amzn.to/2mBSfE9) This keeps me warm with it's Wifi rays blanketing the house. Also used as a presence Tracker for iPhones/People.
 * Lots of iOS Devices ([iPads](http://amzn.to/2l2qyRb), iPods, [iPhones](http://amzn.to/2l9Yoq9))
 * [Nest Thermostats](http://amzn.to/2eAhB1k) - Smart Thermostat
 * [Amazon Echo](http://amzn.to/2dSVbK4) and [DOT](http://amzn.to/2e3vHFQ)
diff --git a/configuration.yaml b/configuration.yaml
index c760b9b8..f15f3ab1 100755
--- a/configuration.yaml
+++ b/configuration.yaml
@@ -22,7 +22,7 @@ frontend:
 
 group: !include_dir_merge_named group
 device_tracker: !include_dir_merge_list device_tracker
-#discovery:
+discovery:
 updater:
 sun:
 
diff --git a/customize/device_tracker.yaml b/customize/device_tracker.yaml
index 4486d5c2..fc9f0f49 100755
--- a/customize/device_tracker.yaml
+++ b/customize/device_tracker.yaml
@@ -1,3 +1,4 @@
+
 device_tracker.actiontechap:
   friendly_name: 'Actiontechap'
   emulated_hue: False
@@ -38,14 +39,6 @@ device_tracker.carlo:
 
 
 
-device_tracker.carloultra:
-  friendly_name: 'Carlo-Ultra'
-  emulated_hue: False
-  hidden: True
-
-
-
-
 device_tracker.chromecast_audio_1:
   friendly_name: 'Chromecast Audio 1'
   emulated_hue: False
@@ -78,14 +71,6 @@ device_tracker.cisco_ap:
 
 
 
-device_tracker.desktopcmaq4tf:
-  friendly_name: 'Desktop-Cmaq4tf'
-  emulated_hue: False
-  hidden: True
-
-
-
-
 device_tracker.hue_hub_1:
   friendly_name: 'Hue Hub 1'
   emulated_hue: False
@@ -110,7 +95,7 @@ device_tracker.ipmdemounit:
 
 
 
-device_tracker.justindot:
+device_tracker.justin_dot:
   friendly_name: 'Justin-Dot'
   emulated_hue: False
   hidden: True
@@ -126,8 +111,16 @@ device_tracker.large_garage:
 
 
 
-device_tracker.living_room:
-  friendly_name: 'Living Room'
+device_tracker.living_room_roku:
+  friendly_name: 'Living Room Roku'
+  emulated_hue: False
+  hidden: True
+
+
+
+
+device_tracker.master_bedroom_roku:
+  friendly_name: 'Master Bedroom Roku'
   emulated_hue: False
   hidden: True
 
@@ -234,7 +227,7 @@ device_tracker.stacey:
   friendly_name: 'Stacey'
   emulated_hue: False
   hidden: False
-
+  
 
 
 
diff --git a/device_tracker/unifi.yaml b/device_tracker/unifi.yaml
index 4227ec84..35c7de67 100755
--- a/device_tracker/unifi.yaml
+++ b/device_tracker/unifi.yaml
@@ -3,3 +3,4 @@
   password: !secret unifi_password
   host: !secret unifi_host
   verify_ssl: false
+  track_new_devices: no