ProximityAlert changes and improvement.