refactor
solid refactor
final_commit_with_stretch