updated callers to location_to_son.