modified the id_ flow