Updated the way that the location descriptions get swapped out