Added location and identify