Initial location enhancement