refactor for packaging