A nit (which you don't have to change)-- I'd change the name of the variable to locator. In the code that this came from there was both an old-style location and a new locator/location, so that's why the variable was named new_location. In this context, it doesn't make sense.