refactor
refactor
refactor
refactor: no vec