rearrange location tracking