[dist] fns overrides
[refactor]