internal_refactor modified