Add cycle check, update text