Changes to get the first location graph to work