Updated location tracking