 - internal refactor
