Started to add location to rates