Changed to include Proximity API with using