Added Support for Nearby Spots