Added logic to handle new location updates