Source Locations 2.0