Inv2.0 now working with locations.