refactoring + adding the break to the workflow.