refactor for new build