Updated with all location data